add

fs-company/src/main/java/com/fs/company/controller/common/Test.java

@@ -28,6 +28,10 @@ import com.fs.his.service.impl.FsPackageOrderServiceImpl;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.his.utils.qrcode.QRCodeUtils;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
+import com.fs.hisStore.domain.FsStorePaymentScrm;
+import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
+import com.fs.hisStore.service.IFsStoreOrderScrmService;
+import com.fs.hisStore.vo.FsStoreOrderVO;
 import com.fs.im.service.IImService;
 import com.fs.im.service.OpenIMService;
 import com.fs.qw.service.IQwAppContactWayService;
@@ -41,6 +45,7 @@ import com.fs.sop.service.IQwSopTempDayService;
 import com.fs.sop.service.IQwSopTempRulesService;
 import com.fs.sop.service.IQwSopTempService;
 import com.fs.system.mapper.SysConfigMapper;
+import com.fs.wx.domain.FsWxExpressTask;
 import com.google.zxing.WriterException;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -52,6 +57,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import javax.imageio.ImageIO;
@@ -81,6 +87,8 @@ public class Test {
     @Autowired
     IFsStoreOrderService fsStoreOrderService;
     @Autowired
+    FsStoreOrderScrmMapper fsStoreOrderScrmMapper    ;
+    @Autowired
     FsStoreOrderMapper fsStoreOrderMapper;
     @Autowired
     private RedisCache redisCache;
@@ -251,4 +259,26 @@ public class Test {
         }
     }
 
+
+//    void save(){
+//        List<FsStoreOrderScrm> FsStoreOrderScrms = fsStoreOrderScrmMapper.selectFsStoreOrderList(new FsStoreOrderScrm());
+//        for (FsStoreOrderScrm fsStoreOrderScrm : FsStoreOrderScrms) {
+//            FsWxExpressTask fsWxExpressTask = new FsWxExpressTask();
+//            fsWxExpressTask.setUserId(order.getUserId());
+//            fsWxExpressTask.setStatus(0);
+//            fsWxExpressTask.setRetryCount(0);
+//            fsWxExpressTask.setCreateTime(LocalDateTime.now());
+//            fsWxExpressTask.setUpdateTime(LocalDateTime.now());
+//            fsWxExpressTask.setOrderCode(order.getOrderCode());
+//            fsWxExpressTask.setExpressCompany(express.getCode());
+//            fsWxExpressTask.setExpressNo(deliveryId);
+//            List<FsStorePaymentScrm> fsStorePayments = fsStorePaymentScrmService.selectFsStorePaymentByOrderIdNew(order.getId());
+//            if(fsStorePayments!=null&&!fsStorePayments.isEmpty()){
+//                FsStorePaymentScrm  fsStorePayment = fsStorePayments.get(0);
+//                fsWxExpressTask.setPayCode(fsStorePayment.getPayCode());
+//            }
+//            fsWxExpressTaskMapper.insert(fsWxExpressTask);
+//        }
+//
+//    }
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsUserScrm.java

@@ -170,6 +170,38 @@ public class FsUserScrm extends BaseEntity
 
     private Long qwExtId;
 
+    private String   orderCount;
+
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getOrderCount() {
+        return orderCount;
+    }
+
+    public void setOrderCount(String orderCount) {
+        this.orderCount = orderCount;
+    }
+
+    public String getCompanyUserNickName() {
+        return companyUserNickName;
+    }
+
+    public void setCompanyUserNickName(String companyUserNickName) {
+        this.companyUserNickName = companyUserNickName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     /**
      * 企微销售ID
      * **/
@@ -196,6 +228,9 @@ public class FsUserScrm extends BaseEntity
         }
     }
 
+
+
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
     private Date startCreateTime;