java/qijisheng.git

			@@ -450,14 +450,12 @@
			BigDecimal bigDecimal = BigDecimal.ZERO;
			for (MyShoppingCartVo myShoppingCartVo : goodsList) {
			bigDecimal = bigDecimal.add(myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber())));
			myShoppingCartVo.setEarnSpendingPoints(myShoppingCartVo.getEarnSpendingPoints() * myShoppingCartVo.getNumber());
			}
			confirmOrderVo.setOrderMoney(bigDecimal);
			}else{
			int sum = 0;
			for (MyShoppingCartVo myShoppingCartVo : goodsList) {
			sum += ((null != myShoppingCartVo.getPoint() ? myShoppingCartVo.getPoint() : 0) * myShoppingCartVo.getNumber());
			myShoppingCartVo.setEarnSpendingPoints((null != myShoppingCartVo.getEarnSpendingPoints() ? myShoppingCartVo.getEarnSpendingPoints() : 0) * myShoppingCartVo.getNumber());
			}
			confirmOrderVo.setOrderPoint(sum);
			}
			@@ -466,7 +464,6 @@
			BigDecimal paymentMoney = orderMoney;
			//总优惠金额
			BigDecimal activityAmount = BigDecimal.ZERO;


			BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
			confirmOrderVo.setUseSimultaneously(JSON.parseObject(baseSetting.getContent()).getInteger("status") == 1);
			@@ -505,7 +502,7 @@
			BigDecimal goodsMoney = BigDecimal.ZERO;
			for (MyShoppingCartVo myShoppingCartVo : goodsList) {
			String goodsId = myShoppingCartVo.getGoodsId().toString();
			BigDecimal cash = myShoppingCartVo.getCash();
			BigDecimal cash = myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber()));
			if(parseArray.contains(goodsId)){
			goodsMoney = goodsMoney.add(cash);
			}else{
			@@ -886,7 +883,7 @@
			BigDecimal goodsMoney = BigDecimal.ZERO;
			for (MyShoppingCartVo myShoppingCartVo : goodsList) {
			String goodsId = myShoppingCartVo.getGoodsId().toString();
			BigDecimal cash = myShoppingCartVo.getCash();
			BigDecimal cash = myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber()));
			if(parseArray.contains(goodsId)){
			goodsMoney = goodsMoney.add(cash);
			}else{

	ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -27,7 +27,7 @@
			tup.variable_point,
			tup.change_direction
			FROM
			t_user_point tup
			(select * from t_user_point union all select * from t_user_point_copy) tup
			LEFT JOIN t_app_user tau ON tup.app_user_id = tau.id
			<where>
			tup.type not in (8, 9, 14) and tau.status != 3 and tau.del_flag = 0