Merge branch 'feature/系统日志前端优化1210' of qng/kmall-haikong into master

11

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

@@ -3528,7 +3528,6 @@ public class OrderServiceImpl implements OrderService {
         List<IntegralGoBackEntity> changeRecordEntityList = haiKongMemberScoreChangeRecordService.queryIntegralGoBack(order.getOrderSn());
         for(IntegralGoBackEntity integralGoBackEntity:changeRecordEntityList) {
            String integralGoBackEntityMsg = JSON.toJSONString(integralGoBackEntity);
-            Date dateResend = new Date();
             String responseMsg = haiKongMemberTemplate.rollbackMemberScore(integralGoBackEntityMsg);
             Map<String, Object> res = JSON.parseObject(responseMsg, Map.class);
             LOGGER.info("=======> [vipIntegralGoBack-----调用会员系统积分全量回退接口数据]" + responseMsg);
@@ -3556,19 +3555,16 @@ public class OrderServiceImpl implements OrderService {
      * @param order
      */
     private void vmcShopMall(OrderEntity order) {
-        LOGGER.info("=======> [vmcShopMall-----调用VMCShop接口开始发送退款订单数据]"+order.getOrderSn());
-        String body = JacksonUtil.toJson(order.getOrderSn());
-        InterfaceSendLogEntity interfaceSendLogEntity = new InterfaceSendLogEntity();
-        interfaceSendLogEntity.setRequestDate(new Date());
-        interfaceSendLogEntity.setSysType(Dict.sendLog.item_mall.getItemName());
+        LOGGER.info("=======> [vmcShopMall-----调用VMCShop接口开始发送退款订单数据]"+JSON.toJSONString(order));
+        Map<String,String> map = new HashMap<>();
+        map.put("outer_order_no",order.getOrderSn());
+        String body = JacksonUtil.toJson(map);
         String response = vmcShopTemplate.refundOrder(body);
-        Date dateResend = new Date();
         //解析响应数据
         LOGGER.info("=======> [vmcShopMall------发送退款订单数据成功，开始处理后续流程]"+response);
         Map<String,String> res = JSON.parseObject(response,Map.class);
-        interfaceSendLogEntity.setMsgStatus(res.get("code"));
 
-        LOGGER.info(order.getOrderSn()+"[发送退款订单数据]"+JSON.toJSONString(order));
+        LOGGER.info(order.getOrderSn()+"[解析响应数据]"+JSON.toJSONString(res));
 
     }
 
@@ -4693,6 +4689,16 @@ public class OrderServiceImpl implements OrderService {
         ) {
             return R.error(500,"无法重发订单，请检查订单状态");
         }
+        OrderProcessRecordEntity orderProcessRecordEntity = orderProcessRecordDao.queryObjectByOrderSn(orderEntity.getOrderSn());
+        if(null==orderProcessRecordEntity.getIsCustomsSend()){
+            return R.error(500,"订单尚未发送至下游系统，无法重发订单");
+        }else{
+            if(Dict.orderCustomsStatus.item_1.getItem().equals(orderProcessRecordEntity.getIsCustomsSend())||
+                    Dict.orderCustomsStatus.item_2.getItem().equals(orderProcessRecordEntity.getIsCustomsSend())){
+                return R.error(500,"订单处于清关放行状态或查验状态，无需重发订单");
+            }
+        }
+
 
         LOGGER.info("=======> [调用VMCShop接口开始发送退款订单数据]"+orderSn);
         Map<String,String> map = new HashMap<>();
@@ -4701,8 +4707,8 @@ public class OrderServiceImpl implements OrderService {
         String response = vmcShopTemplate.resendOrder(body);
         //解析响应数据
         LOGGER.info("=======> [resendOrderHkMall---重发订单数据成功，开始处理后续流程]"+response);
-        Map<String,String> res = JSON.parseObject(response,Map.class);
-        if("0".equals(res.get("code"))){
+        Map<String,Object> res = JSON.parseObject(response,Map.class);
+        if("0".equals(res.get("code").toString())){
             pickUpCodeService.updatePickUpCodeStatusByOrderSn(orderSn, Dict.PickUpCodeStatusEnum.item_0.getStatus());
             return R.ok();
         }else{

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -1171,7 +1171,7 @@
         SELECT
             a.id,a.sku,a.goods_number,a.goods_sn,a.name,a.list_pic_url,a.prod_barcode,r.market_price storeMarketPrice, r.retail_price as retailPrice,r.retail_price storeRetailPrice ,r.stock_num,s.store_name,r.product_id as productId,s.id 'storeId',a.goods_rate as goodsRate,
             a.hs_code as hsCode , a.legal_unit1_qty as legalUnit1Qty , a.legal_unit2_qty as legalUnit2Qty,a.ciq_prod_model as ciqProdModel,a.to_be_restored, r.stock_num, r.exit_region_number as exitRegionNumber,
-            a.category_id as categoryId, a.brand_id as brandId, a.net_weight as netWeight
+            a.category_id as categoryId, a.brand_id as brandId,a.net_weight as netWeight
         FROM
             mall_goods a
         LEFT JOIN mall_product_store_rela r ON r.goods_id = a.id

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

@@ -1226,7 +1226,7 @@ let vm = new Vue({
             confirm('确认重发订单吗？', function () {
                 $.get("../order/resendOrderHkMall/"+vm.orderEntity.orderSn, function (r) {
                     if(r.code == "0"){
-                        alert(r.msg);
+                        alert("重发订单成功");
                     } else {
                         alert(r.msg);
                     }

kmall-common/src/main/java/com/kmall/common/constant/Dict.java

@@ -2041,4 +2041,39 @@ public class Dict {
         }
     }
 
+
+    /**
+     * 清关状态
+     */
+    public enum orderCustomsStatus{
+        item_1("1", "放行"),
+        item_2("2", "查验"),
+        item_3("3", "清关失败"),
+        item_4("4", "其他");
+
+        orderCustomsStatus(String item, String itemName) {
+            this.item = item;
+            this.itemName = itemName;
+        }
+
+        private String item;
+        private String itemName;
+
+        public String getItemName() {
+            return itemName;
+        }
+
+        public void setItemName(String itemName) {
+            this.itemName = itemName;
+        }
+
+        public String getItem() {
+            return item;
+        }
+
+        public void setItem(String item) {
+            this.item = item;
+        }
+    }
+
 }