Merge remote-tracking branch 'origin/康年堂' into 康年堂

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductPackageScrmController.java

@@ -47,7 +47,7 @@ public class FsStoreProductPackageScrmController extends BaseController
     /**
      * 查询商品组合套餐列表
      */
-    @PreAuthorize("@ss.hasPermi('store:storeProductPackage:list')")
+//    @PreAuthorize("@ss.hasPermi('store:storeProductPackage:list')")
     @GetMapping("/list")
     public TableDataInfo list(FsStoreProductPackageScrm fsStoreProductPackage)
     {

fs-framework/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -107,7 +107,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         "/**/*.html",
                         "/**/*.css",
                         "/**/*.js",
-                        "/profile/**"
+                        "/profile/**",
+                        "/store/store/storeProductPackage/list"
                 ).permitAll()
                 .antMatchers("/baidu/**").anonymous()
                 .antMatchers("/baiduBack/**").anonymous()

fs-service/src/main/java/com/fs/his/vo/FsStoreOrderStateVo.java

@@ -3,12 +3,32 @@ package com.fs.his.vo;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 
 @Data
 public class FsStoreOrderStateVo {
-    @Excel(name = "订单编号")
+    @Excel(name = "药品订单号",required = true)
     private String orderCode;
 
-    @Excel(name = "订单状态")
+    @Excel(name = "订单状态",dictType = "store_order_status")
     private String status;
+
+    @Excel(name = "物流代收金额")
+    private BigDecimal payRemain;
+
+    /** 物流状态 */
+    @Excel(name = "物流状态",dictType = "store_order_delivery_status")
+    private String deliveryStatus;
+
+    /** 物流跟踪状态 */
+    @Excel(name = "物流跟踪状态",dictType = "store_order_delivery_type")
+    private String deliveryType;
+
+    /** shou */
+    @Excel(name = "收货人电话")
+    private String userPhone;
+    /** 详情地址 */
+    @Excel(name = "详情地址")
+    private String userAddress;
 }

fs-service/src/main/java/com/fs/hisStore/enums/OrderInfoEnum.java

@@ -1,5 +1,6 @@
 package com.fs.hisStore.enums;
 
+import com.fs.baidu.vo.ReportVO;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -16,6 +17,7 @@ public enum OrderInfoEnum {
     STATUS_2(2,"待收货"),
     STATUS_3(3,"已完成"),
     STATUS_4(4,"待评价"),
+    STATUS_6(6,"待推送"), //金牛代服特殊状态
 
     PAY_STATUS_0(0,"未支付"),
     PAY_STATUS_1(1,"已支付"),

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -5542,33 +5542,84 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     failureMsg.append(msg).append("订单不存在");
                     continue;
                 }
-
-                FsStoreOrderScrm param = new FsStoreOrderScrm();
+                FsStoreOrderScrm param = new FsStoreOrderScrm(); //修改订单的参数
                 param.setOrderCode(vo.getOrderCode());
+                param.setId(o.getId());
                 String inputStatus = vo.getStatus();
-                if (StringUtils.isEmpty(inputStatus)) {
+                if ("6".equals(inputStatus)) {
                     failureNum++;
                     String msg = "<br/>" + failureNum + "、订单编号 " + vo.getOrderCode() + " 导入失败：";
-                    failureMsg.append(msg).append("该订单状态为空");
+                    failureMsg.append(msg).append("该状态不支持修改为待推送");
                     continue;
                 }
-
                 if ("-1".equals(inputStatus)) {
                     failureNum++;
                     String msg = "<br/>" + failureNum + "、订单编号 " + vo.getOrderCode() + " 导入失败：";
                     failureMsg.append(msg).append("该状态不支持修改为退款中，需要手动申请退款");
                     continue;
                 }
-
                 if ("-2".equals(inputStatus)) {
                     failureNum++;
                     String msg = "<br/>" + failureNum + "、订单编号 " + vo.getOrderCode() + " 导入失败：";
-                    failureMsg.append(msg).append("该状态不支持修改为已退款，需要审核完成退款");
+                    failureMsg.append(msg).append("该状态不支持修改为退款中，需要审核完成退款");
                     continue;
                 }
+                Integer status = o.getStatus();
+                if ("-3".equals(inputStatus)) {
+                    if (0 != status) {
+                        failureNum++;
+                        String msg = "<br/>" + failureNum + "、订单编号 " + vo.getOrderCode() + " 导入失败：";
+                        failureMsg.append(msg).append("该状态不支持修改为取消");
+                        continue;
+                    }
+
+                }
+                if ("2".equals(inputStatus)) {
+                    if (StringUtils.isBlank(o.getDeliveryId())) {
+                        failureNum++;
+                        String msg = "<br/>" + failureNum + "、订单编号 " + vo.getOrderCode() + " 导入失败：";
+                        failureMsg.append(msg).append("该状态不支持修改为待收货，没有物流信息");
+                        continue;
+                    }
+
+                }
+
+
 
-                param.setStatus(Integer.valueOf(inputStatus));
-                fsStoreOrderMapper.updateFsStoreOrderByOrderCode(param);
+                if (StringUtils.isNotBlank(inputStatus)){
+                    param.setStatus(Integer.valueOf(inputStatus));
+                    status = Integer.valueOf(inputStatus);
+                }
+                /**
+                 * 地址和电话仅待付款和待推送可以修改
+                 */
+                String userAddress = vo.getUserAddress();
+                String userPhone = vo.getUserPhone();
+                if (StringUtils.isNotBlank(userAddress) || StringUtils.isNotBlank(userPhone)){
+                    if (Objects.equals(OrderInfoEnum.STATUS_0.getValue(), status) || Objects.equals(OrderInfoEnum.STATUS_6.getValue(), status)) {
+                        param.setUserAddress(userAddress.isEmpty()?null:userAddress);
+                        param.setUserPhone(userPhone.isEmpty()?null:userPhone);
+                    } else {
+                        failureNum++;
+                        String msg = "<br/>" + failureNum + "、订单编号 " + vo.getOrderCode() + " 修改失败：";
+                        failureMsg.append(msg).append("该状态不支持修改收货人地址或电话");
+                        continue;
+                    }
+                }
+                param.setDeliveryStatus((vo.getDeliveryStatus()==null|| vo.getDeliveryStatus().isEmpty())?null:Integer.valueOf(vo.getDeliveryStatus()));
+                param.setDeliveryType(vo.getDeliveryType().isEmpty()?null:vo.getDeliveryType());
+                param.setUpdateTime(DateUtils.getNowDate());
+
+                //修改订单金额
+                BigDecimal payRemain = vo.getPayRemain();
+                if (payRemain != null){
+                    if (!payRemain.equals(o.getPayRemain())){
+                        BigDecimal payMoney = o.getPayMoney(); //实收金额
+                        param.setPayPrice(payMoney.add(payRemain)); //应收金额
+                        param.setPayRemain(vo.getPayRemain());
+                    }
+                }
+                fsStoreOrderMapper.updateFsStoreOrder(param);
 
                 successNum++;
                 successMsg.append("<br/>").append(successNum).append("、订单编号 ").append(vo.getOrderCode()).append(" 修改成功");