1.前端取货码异常提示

2.小票核销的金额
3.导入日常活动后价格的变化
4.修改异常查询的地址

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -1052,8 +1052,7 @@ public class OrderController {
 
         try {
             // 查询失败原因
-            String url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl();
-            url = "";
+            String url = OmsMerchPropertiesBuilder.instance().getWxOrderResendUrl() + "/"+orderSn;
             // 同步访问,返回结果字符串
             response = OkHttpUtils.post(map, url, "SSL");
             ResponseData responseData = JacksonUtils.fromStringJson(response, ResponseData.class);

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -1354,7 +1354,8 @@ public class GoodsServiceImpl implements GoodsService {
             // TODO 可能会直接替代产品价格
             if (discountEntity != null) {
                 goods.setActualPaymentAmount(discountEntity.getActivityPrice());
-                goods.setDiscountedPrice(retailPrice.subtract(discountEntity.getActivityPrice()).setScale(2,BigDecimal.ROUND_HALF_UP));
+                goods.setRetailPrice(discountEntity.getActivityPrice());
+//                goods.setDiscountedPrice(retailPrice.subtract(discountEntity.getActivityPrice()).setScale(2,BigDecimal.ROUND_HALF_UP));
                 goods.setActivity("打折");
             }
         }
@@ -1368,7 +1369,8 @@ public class GoodsServiceImpl implements GoodsService {
             MkDailyActivitiesEntity dailyActivitiesEntity = dailyActivitiesService.queryByBarCode(mkaId,prodBarcode);
             if(dailyActivitiesEntity != null){
                 goods.setActualPaymentAmount(dailyActivitiesEntity.getActivityPrice());
-                goods.setDiscountedPrice(retailPrice.subtract(dailyActivitiesEntity.getActivityPrice()).setScale(2,BigDecimal.ROUND_HALF_UP));
+                goods.setRetailPrice(dailyActivitiesEntity.getActivityPrice());
+//                goods.setDiscountedPrice(retailPrice.subtract(dailyActivitiesEntity.getActivityPrice()).setScale(2,BigDecimal.ROUND_HALF_UP));
                 goods.setActivity("日常活动");
 
             }
@@ -1384,7 +1386,8 @@ public class GoodsServiceImpl implements GoodsService {
             // 如果该商品存在临时促销，直接替换活动价格
             if(promotionEntity != null){
                 goods.setActualPaymentAmount(promotionEntity.getActivityPrice());
-                goods.setDiscountedPrice(retailPrice.subtract(promotionEntity.getActivityPrice()).setScale(2,BigDecimal.ROUND_HALF_UP));
+                goods.setRetailPrice(promotionEntity.getActivityPrice());
+//                goods.setDiscountedPrice(retailPrice.subtract(promotionEntity.getActivityPrice()).setScale(2,BigDecimal.ROUND_HALF_UP));
                 goods.setActivity("临时促销");
 
             }

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesFullGiftServiceImpl.java

@@ -110,10 +110,10 @@ public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftServ
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                 String nowTime = format.format(new Date());
 
-                MkActivitiesFullGiftEntity old =  mkActivitiesFullGiftDao.queryByCodeOrBrand(Long.parseLong(mkaId),freeGoodsDto.getBarCode(),freeGoodsDto.getBrand(),nowTime);
-                if(old != null){
-                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+freeGoodsDto.getBarCode()+"},品牌,{"+freeGoodsDto.getBrand()+"}",500);
-                }
+//                MkActivitiesFullGiftEntity old =  mkActivitiesFullGiftDao.queryByCodeOrBrand(Long.parseLong(mkaId),freeGoodsDto.getBarCode(),freeGoodsDto.getBrand(),nowTime);
+//                if(old != null){
+//                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+freeGoodsDto.getBarCode()+"},品牌,{"+freeGoodsDto.getBrand()+"}",500);
+//                }
 
                 // 保存日常活动商品
                 MkActivitiesFullGiftEntity mkActivitiesFullGiftEntity = new MkActivitiesFullGiftEntity();

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesGetOneFreeGoodsServiceImpl.java

@@ -103,10 +103,10 @@ public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOn
                     throw new RRException(r.get("msg").toString());
                 }
 
-                MkActivitiesGetOneFreeGoodsEntity old = mkActivitiesGetOneFreeGoodsDao.queryByCodeOrBrand(Long.parseLong(mkaId), buyOneGetOneFreeDto.getBuyBarCode(), buyOneGetOneFreeDto.getBuyBrand());
-                if(old != null){
-                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+buyOneGetOneFreeDto.getBuyBarCode()+"},品牌,{"+buyOneGetOneFreeDto.getBuyBrand()+"}",500);
-                }
+//                MkActivitiesGetOneFreeGoodsEntity old = mkActivitiesGetOneFreeGoodsDao.queryByCodeOrBrand(Long.parseLong(mkaId), buyOneGetOneFreeDto.getBuyBarCode(), buyOneGetOneFreeDto.getBuyBrand());
+//                if(old != null){
+//                    throw new RRException("该商品或者该品牌已经参与本次活动，商品{"+buyOneGetOneFreeDto.getBuyBarCode()+"},品牌,{"+buyOneGetOneFreeDto.getBuyBrand()+"}",500);
+//                }
 
                 // 保存日常活动商品
                 MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoodsEntity = new MkActivitiesGetOneFreeGoodsEntity();

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -376,7 +376,7 @@ public class OrderServiceImpl implements OrderService {
 
         // 小票头
         TicketHead head = new TicketHead();
-        head.setTitle(OmsMerchPropertiesBuilder.instance().getMerchName() + storeEntity.getStoreName());
+        head.setTitle(storeEntity.getStoreName());
         //        head.setMemberId(orderEntity.getUserName().toString());
         head.setOrderId(orderEntity.getOrderSn());
         head.setTradeTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss EEE").format(new Date()));
@@ -388,14 +388,17 @@ public class OrderServiceImpl implements OrderService {
         List<Goods> goodsList = new ArrayList<>();
         for (OrderGoodsEntity orderGoods : orderGoodsEntityList) {
             goodsTotal += orderGoods.getNumber();
-            total = total.add(orderGoods.getMarketPrice().multiply(new BigDecimal(orderGoods.getNumber())))
-                    .setScale(2, BigDecimal.ROUND_HALF_UP);
-            taxTotal = taxTotal.add(orderGoods.getGoodsRate().multiply(orderGoods.getMarketPrice()).setScale(2, BigDecimal.ROUND_HALF_UP));
-            Goods goods = new Goods(orderGoods.getGoodsName(), orderGoods.getMarketPrice().toString(),
+            BigDecimal totalPirce = orderGoods.getMarketPrice().add(orderGoods.getDiscountedPrice()).setScale(2,BigDecimal.ROUND_HALF_DOWN);
+            total = totalPirce;
+//            total = total.add(orderGoods.getMarketPrice().multiply(new BigDecimal(orderGoods.getNumber())))
+//                    .setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal uprice = totalPirce.divide(new BigDecimal(orderGoods.getNumber()), 2, BigDecimal.ROUND_HALF_DOWN);
+            taxTotal = uprice
+                        .divide(new BigDecimal(1).add(orderGoods.getGoodsRate()),2,BigDecimal.ROUND_HALF_DOWN);
+            Goods goods = new Goods(orderGoods.getGoodsName(), uprice.toString(),
                                     orderGoods.getGoodsRate().multiply(orderGoods.getMarketPrice()).setScale(2, BigDecimal.ROUND_HALF_UP).toString(),
                                     orderGoods.getNumber().toString(),
-                                    orderGoods.getRetailPrice().multiply(new BigDecimal(orderGoods.getNumber()))
-                                              .setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+                                    totalPirce.toString());
             goodsList.add(goods);
         }
 
@@ -1959,15 +1962,15 @@ public class OrderServiceImpl implements OrderService {
             // 判断是微信的支付码还是支付宝的支付码
             if (parCode.startsWith("28")) {
             // 支付宝支付
-//            AliPay(user, parCode , order, processRecordEntity, orderWXPayRecordCurrent, store);
+            AliPay(user, parCode , order, processRecordEntity, orderWXPayRecordCurrent, store);
 
             }else{
             // 微信支付
-//                try {
-//                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
-//                } catch (ParseException e) {
-//                    throw e;
-//                }
+                try {
+                    wxPay(user, parCode, resultObj, order, processRecordEntity, orderWXPayRecordCurrent, store);
+                } catch (ParseException e) {
+                    throw e;
+                }
 
             }
 
@@ -2316,7 +2319,7 @@ public class OrderServiceImpl implements OrderService {
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
-                if(times >= 30){
+                if(times >= 20){
                     throw new RuntimeException("超过30s未支付，订单下单失败");
                 }
                 times++;
@@ -2682,7 +2685,7 @@ public class OrderServiceImpl implements OrderService {
         orderGoodsVo.setProduct_id(Long.valueOf(goodsDto.getProductId()));
         orderGoodsVo.setGoods_name(goodsDto.getName());
         orderGoodsVo.setList_pic_url(goodsDto.getListPicUrl());
-        orderGoodsVo.setMarket_price(goodsDto.getStoreMarketPrice());
+        orderGoodsVo.setMarket_price(goodsDto.getStoreRetailPrice());
         orderGoodsVo.setRetail_price(goodsDto.getStoreRetailPrice());
 
         orderGoodsVo.setDiscountedPrice(goodsDto.getDiscountedPrice());

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -643,8 +643,11 @@ let vm = new Vue({
                             var shopcartGoods = vm.goodsList[j];
                             var shopcartFree = vm.freeBardcode.get(shopcartGoods.prodBarcode);
                             if(shopcartFree /*&& shopcartGoods.actualPaymentAmount*/){
-                                shopcartGoods.actualPaymentAmount = shopcartGoods.actualPaymentAmount + (shopcartGoods.retailPrice * shopcartFree);
-                                shopcartGoods.discountedPrice = shopcartGoods.discountedPrice - (shopcartGoods.retailPrice * shopcartFree);
+                                shopcartGoods.actualPaymentAmount = shopcartGoods.actualPaymentAmount + (shopcartGoods.retailPrice * shopcartGoods.sellVolume);
+                                shopcartGoods.discountedPrice = shopcartGoods.discountedPrice - (shopcartGoods.retailPrice * shopcartGoods.sellVolume);
+
+                                vm.discountedPrice = vm.discountedPrice - (shopcartGoods.retailPrice * shopcartGoods.sellVolume);
+                                vm.actualPrice = vm.actualPrice + (shopcartGoods.retailPrice * shopcartGoods.sellVolume);
                                 vm.freeBardcode.set(shopcartGoods.prodBarcode, 0);// 重置回0
 
                             }
@@ -661,6 +664,10 @@ let vm = new Vue({
                     vm.discountedPrice = vm.discountedPrice - goods.discountedPrice;
                     vm.actualPrice = vm.actualPrice - goods.actualPaymentAmount;
                     vm.boughtNum.delete(goods.prodBarcode);
+                    vm.totalPrice =  Math.round(vm.totalPrice * 100) / 100;
+                    vm.discountedPrice =  Math.round(vm.discountedPrice * 100) / 100;
+                    vm.actualPrice =  Math.round(vm.actualPrice * 100) / 100;
+                    vm.showReduceMoney =  Math.round(vm.showReduceMoney * 100) / 100;
                     this.goodsList.splice(i,1);
                     break;
                 }

kmall-admin/src/main/webapp/userLogin.html

@@ -106,6 +106,9 @@
                         alert("获取机器码失败，请联系管理员");
                     }
                 })
+                // 本地调试的时候打开下面的注释代码
+                // vm.machineCode = "0z4kBPFEve0=";
+                // sessionStorage.setItem("machineCode","0z4kBPFEve0=");
 
                 // $.get("http://127.0.0.1:8000/api/reg/gen" , function (r) {
                 //     console.log(r);
@@ -126,7 +129,8 @@
                 this.src = "captcha.jpg?t=" + $.now();
             },
             login: function (event) {
-                var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=" + vm.machineCode+"&loginType=2"; //TODO  新增加一个机器码;
+                // var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=" + vm.machineCode+"&loginType=2"; //TODO  新增加一个机器码;
+                var data = "username=" + vm.username + "&password=" + vm.password + "&captcha=" + vm.captcha + "&machineCode=0z4kBPFEve0=&loginType=2"; //TODO  新增加一个机器码;
                 sessionStorage.removeItem("permsSet");
                 var code = sessionStorage.getItem("machineCode");
                 if(!code){

kmall-manager/src/main/resources/conf/oms-merch.properties

@@ -8,7 +8,7 @@ merch.merchName=\u4E2D\u7F51\u79D1\u6280
 merch.merchShortName=ZW
 
 #ccnet\u751F\u4EA7\u73AF\u5883\u67E5\u8BE2\u652F\u4ED8\u5355\u3001\u7535\u5B50\u8BA2\u5355\u3001\u8FD0\u5355\u5931\u8D25\u8BA2\u5355\u63A5\u53E3
-merch.wxOrderResendUrl=http://120.78.152.8:9580/wx/wxOrderResendQueryAll
+merch.wxOrderResendUrl=http://183.62.225.124:8680/wx/wxOrderResendQueryAll
 
 #oms\u6D4B\u8BD5\u73AF\u5883\u5BC6\u94A5
 merch.md5Salt=IxyIvP0sJqlUZinx