managew 发货

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/issueOrder/OrderDeliverGoodsReqDTO.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/ass/AssOrderDeliverGoodsReqDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.dto.issueOrder;
+package cn.com.taiji.managew.api.ass;
 
 import cn.com.taiji.common.valid.ViolationValidator;
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
@@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class OrderDeliverGoodsReqDTO extends AbstractStaffBizRequestDTO {
+public class AssOrderDeliverGoodsReqDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "订单编号")
     @NotBlank

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/ass/AssOrderinfoController.java

@@ -7,7 +7,6 @@ import cn.com.taiji.managew.api.MyValidController;
 import cn.com.taiji.managew.dto.ass.AssOrderCancelDTO;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
-import cn.com.taiji.managew.dto.issueOrder.OrderDeliverGoodsReqDTO;
 import cn.com.taiji.managew.manager.ass.AssOrderinfoManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -56,7 +55,7 @@ public class AssOrderinfoController extends MyValidController {
 
     @ApiOperation("售后订单发货")
     @PostMapping("/orderSend")
-    public ApiResponse<?> orderSend(@Valid @RequestBody OrderDeliverGoodsReqDTO req) throws ManagerException {
+    public ApiResponse<?> orderSend(@Valid @RequestBody AssOrderDeliverGoodsReqDTO req) throws ManagerException {
         manager.orderSend(req);
         return ApiResponse.success();
     }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/issueOrder/IssueOrderQueryController.java

@@ -57,7 +57,7 @@ public class IssueOrderQueryController extends MyValidController {
 
     @ApiOperation(value = "订单发货")
     @PostMapping(value = "/orderSend")
-    public ApiResponse<?> orderSend(@Valid @RequestBody OrderDeliverGoodsReqDTO reqDto) throws ManagerException {
+    public ApiResponse<?> orderSend(@Valid @RequestBody IssueOrderDeliverGoodsReqDTO reqDto) throws ManagerException {
         issueOrderQueryManage.orderSend(reqDto);
         return ApiResponse.success().setMessage("发货成功");
     }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/issueOrder/IssueOrderDeliverGoodsReqDTO.java

@@ -0,0 +1,63 @@
+package cn.com.taiji.managew.dto.issueOrder;
+
+import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import cn.com.taiji.core.entity.dict.ass.AssOrderType;
+import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
+import cn.com.taiji.managew.tools.StringUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * FIXME 待加注解
+ */
+@ApiModel(description = "订单发货请求")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class IssueOrderDeliverGoodsReqDTO extends AbstractStaffBizRequestDTO {
+
+    @ApiModelProperty(value = "订单编号")
+    @NotBlank
+    private String orderNo;
+
+    @ApiModelProperty(value = "快递编号")
+    @NotBlank
+    private String trackingNumber;
+    @ApiModelProperty(value = "快递公司")
+    @NotBlank
+    /***  快递公司*/
+    private String courierCompany;
+    @ApiModelProperty(value = "卡编号")
+    @FixedLength(length = 20)
+    @NotBlank
+    private String cardId;
+    @ApiModelProperty(value = "签编号")
+    @FixedLength(length = 16)
+    @NotBlank
+    private String obuId;
+    @ApiModelProperty(value = "收货人")
+    @NotBlank
+    private String consignee;// 收货人
+    @ApiModelProperty(value = "收货人电话")
+    @NotBlank
+    private String consigneeTel;// 收货人电话
+    @ApiModelProperty(value = "收货所在地区（省、市、区、街道）")
+    @NotBlank
+    private String region;// 收货所在地区（省、市、区、街道）
+    @ApiModelProperty(value = "收货详细地址")
+    @NotBlank
+    private String address;// 收货详细地址
+    @ApiModelProperty(value = "邮政编码")
+//    @NotBlank
+    private String postCode;
+
+
+
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManager.java

@@ -1,12 +1,11 @@
 package cn.com.taiji.managew.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.managew.dto.ass.AssOrderCancelDTO;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
-import cn.com.taiji.managew.dto.issueOrder.OrderDeliverGoodsReqDTO;
+import cn.com.taiji.managew.api.ass.AssOrderDeliverGoodsReqDTO;
 
 /**
  * @Auther: humh
@@ -22,5 +21,5 @@ public interface AssOrderinfoManager {
 
     void cancel(AssOrderCancelDTO req) throws ManagerException;
 
-    void orderSend(OrderDeliverGoodsReqDTO req) throws ManagerException;
+    void orderSend(AssOrderDeliverGoodsReqDTO req) throws ManagerException;
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManagerImpl.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.managew.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.dict.log.OperateType;
@@ -13,9 +12,8 @@ import cn.com.taiji.core.repo.request.ass.AssOrderinfoPageRequest;
 import cn.com.taiji.managew.dto.ass.AssOrderCancelDTO;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
-import cn.com.taiji.managew.dto.issueOrder.OrderDeliverGoodsReqDTO;
+import cn.com.taiji.managew.api.ass.AssOrderDeliverGoodsReqDTO;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
-import cn.com.taiji.managew.model.MyFinals;
 import cn.com.taiji.managew.model.ass.AssOrderInfoModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,7 +67,7 @@ public class AssOrderinfoManagerImpl extends AbstractManagewManager implements A
     }
 
     @Override
-    public void orderSend(OrderDeliverGoodsReqDTO req) throws ManagerException {
+    public void orderSend(AssOrderDeliverGoodsReqDTO req) throws ManagerException {
         req.validate();
         AssOrderSendRequest request = copyProperties(req,new AssOrderSendRequest());
         String openId = findOpenIdByToken(req.getAccessToken());

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderQueryManage.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.managew.manager.issueOrder;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.managew.dto.issueOrder.*;
 
@@ -19,7 +18,7 @@ public interface IssueOrderQueryManage {
     OrderDetailResDTO detail(OrderDetailReqDTO reqDto) throws ManagerException;
 
 
-    void orderSend(OrderDeliverGoodsReqDTO reqDto) throws ManagerException;
+    void orderSend(IssueOrderDeliverGoodsReqDTO reqDto) throws ManagerException;
 
     void orderCancel(OrderCancelRequestDTO reqDto) throws ManagerException;
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderQueryManageImpl.java

@@ -422,7 +422,7 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
 
 
     @Override
-    public void orderSend(OrderDeliverGoodsReqDTO reqDto) throws ManagerException {
+    public void orderSend(IssueOrderDeliverGoodsReqDTO reqDto) throws ManagerException {
 
         //=======================业务校验============================
         // 查询订单
@@ -446,7 +446,7 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
     }
 
     @Transactional(rollbackFor = Exception.class)
-    private void saveOrder(OrderDeliverGoodsReqDTO reqDto, IssueOrderinfo order, InvwCardDetails cardDetails, InvwObuDetails obuDetails) throws ServiceHandleException {
+    private void saveOrder(IssueOrderDeliverGoodsReqDTO reqDto, IssueOrderinfo order, InvwCardDetails cardDetails, InvwObuDetails obuDetails) throws ServiceHandleException {
         LocalDateTime now = LocalDateTime.now();
         // 更新订单
         order.setOrderStep(IssueOrderStep.WAITING_RECEIVE);

zhywpt-app-managew/src/test/java/cn/com/taiji/managew/manager/TestSampleRepo.java

@@ -8,9 +8,12 @@ import cn.com.taiji.core.entity.basic.QtkServiceHall;
 import cn.com.taiji.core.entity.basic.QtkServiceHallBak;
 import cn.com.taiji.core.entity.basic.QtkServicehallLocation;
 import cn.com.taiji.core.entity.basic.QtkServicehallLocationBak;
+import cn.com.taiji.core.entity.dict.basic.*;
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStatus;
+import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import cn.com.taiji.core.entity.dict.issue.OrderPayStatus;
-import cn.com.taiji.core.entity.issue.IssueOrderPay;
-import cn.com.taiji.core.entity.issue.IssueOrderinfo;
+import cn.com.taiji.core.entity.dict.issue.ShippingStatus;
+import cn.com.taiji.core.entity.issue.*;
 import cn.com.taiji.core.manager.tools.issue.QdCallUtil;
 import cn.com.taiji.core.model.comm.protocol.SignJsonRequest;
 import cn.com.taiji.core.model.comm.protocol.ats.model.CallbackModel;
@@ -21,9 +24,9 @@ import cn.com.taiji.core.repo.jpa.basic.QtkServicehallBakRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkServicehallLocationBakRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkServicehallLocationRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkServicehallRepo;
-import cn.com.taiji.core.repo.jpa.issue.IssueOrderPayRepo;
-import cn.com.taiji.core.repo.jpa.issue.IssueOrderinfoRepo;
+import cn.com.taiji.core.repo.jpa.issue.*;
 import cn.com.taiji.managew.Application;
+import org.apache.commons.compress.utils.Lists;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -117,8 +120,6 @@ public class TestSampleRepo extends AbstractCommManager {
     @Autowired
     private IssueOrderinfoRepo issueOrderinfoRepo;
     @Autowired
-    private IssueOrderPayRepo issueOrderPayRepo;
-    @Autowired
     private QdCallUtil qdCallUtil;
 
 //    通知渠道
@@ -216,6 +217,166 @@ public class TestSampleRepo extends AbstractCommManager {
 
     }
 
+    @Autowired
+    private CsmsnOrderinfoRepo csmsnOrderinfoRepo;
+    @Autowired
+    private ErrorLogRepo errorLogRepo;
+
+    @Test
+    public void test333() {
+        List<String> collect = errorLogRepo.findAll().stream().map(ErrorLog::getOrderNo).collect(Collectors.toList());
+//        List<CsmsnOrderinfo> all = csmsnOrderinfoRepo.findAll();
+        List<CsmsnOrderinfo> all = csmsnOrderinfoRepo.findByOrderNoIn(collect);
+        System.out.println("总数据===");
+        System.out.println(all.size());
+        ArrayList<String> err = Lists.newArrayList();
+        ArrayList<IssueOrderinfo> data = Lists.newArrayList();
+        int i = 0;
+        IssueOrderinfo orderinfo = new IssueOrderinfo();
+        for (CsmsnOrderinfo csmsnOrderinfo : all) {
+            if (csmsnOrderinfo.getOrderSource() == null){
+                continue;
+            }
+            i++;
+            try {
+                orderinfo = new IssueOrderinfo();
+                orderinfo.setId(csmsnOrderinfo.getId());
+                orderinfo.setOrderNo(csmsnOrderinfo.getOrderNo());
+                orderinfo.setOrderSource(csmsnOrderinfo.getOrderSource());
+                orderinfo.setChannelId(csmsnOrderinfo.getChannelId());
+                orderinfo.setAgencyId(csmsnOrderinfo.getAgencyId());
+                orderinfo.setAccountId(csmsnOrderinfo.getAccountId());
+                orderinfo.setOrderStep(IssueOrderStep.find(csmsnOrderinfo.getOrderStep()));
+
+                ShippingStatus shippingStatus = null;
+                if ("SHIPPED".equals(csmsnOrderinfo.getShippingStatus())) {
+                    shippingStatus = ShippingStatus.WAIT_RECEIVING;
+                }else if(csmsnOrderinfo.getShippingStatus() == null){
+                    shippingStatus = ShippingStatus.NONE;
+                }else {
+                    shippingStatus = ShippingStatus.valueOf(csmsnOrderinfo.getShippingStatus());
+                }
+                orderinfo.setShippingStatus(shippingStatus);
+                IssueOrderStatus status = null;
+                if (csmsnOrderinfo.getOrderStatus() == OrderStatusEnum.SEAL) {
+                    if (csmsnOrderinfo.getOrderStep() == 11) {
+                        status = IssueOrderStatus.ACTIVE;
+                    } else {
+                        status = IssueOrderStatus.FAIL;
+                    }
+                }else if (csmsnOrderinfo.getOrderStatus() == OrderStatusEnum.FAIL_END) {
+                    status = IssueOrderStatus.FAIL;
+                }else {
+                    status = IssueOrderStatus.valueOf(csmsnOrderinfo.getOrderStatus().name());
+                }
+                orderinfo.setOrderStatus(status);
+                orderinfo.setUserType(csmsnOrderinfo.getUserType());
+                orderinfo.setVanType(csmsnOrderinfo.getVanType());
+                orderinfo.setUserId(csmsnOrderinfo.getUserId());
+                orderinfo.setStaffOpenId(csmsnOrderinfo.getStaffId());
+                orderinfo.setReceiveStatus(csmsnOrderinfo.getReceiveStatus());
+                orderinfo.setReceiver(csmsnOrderinfo.getReceiver());
+                orderinfo.setReceiveTime(csmsnOrderinfo.getReceiveTime());
+                orderinfo.setAuditOpenId(csmsnOrderinfo.getAuditOpId());
+                orderinfo.setAuditTime(csmsnOrderinfo.getAuditTime());
+                orderinfo.setArtificialStatus(csmsnOrderinfo.getArtificialStatus());
+                orderinfo.setProductId(csmsnOrderinfo.getProductId());
+                orderinfo.setProductName(csmsnOrderinfo.getProductName());
+                orderinfo.setProductAgreeNo(csmsnOrderinfo.getProductAgreeNo());
+                orderinfo.setProductTypes(csmsnOrderinfo.getProductTypes());
+                orderinfo.setPromotionModes(csmsnOrderinfo.getPromotionModes());
+                if (!hasText(csmsnOrderinfo.getEquityId())){
+                    orderinfo.setEquityId("-1");
+                }else {
+                    orderinfo.setEquityId(csmsnOrderinfo.getEquityId());
+                }
+//            orderinfo.setEquityName();
+                orderinfo.setAmount(csmsnOrderinfo.getAmount());
+                Boolean flag = csmsnOrderinfo.getPromotionModes() == 1? false : true;
+                orderinfo.setNeedPay(flag);
+                orderinfo.setAgreementEnableTime(csmsnOrderinfo.getAgreementEnableTime());
+                orderinfo.setAgreementId(csmsnOrderinfo.getAgreementId());
+                orderinfo.setCardType(CardType.fromCode(csmsnOrderinfo.getCardType()));
+                orderinfo.setCardId(csmsnOrderinfo.getCardId());
+                orderinfo.setCardStatus(CardStatus.fromCode(csmsnOrderinfo.getCardStatus()));
+                orderinfo.setCardEnableTime(csmsnOrderinfo.getCardEnableTime());
+                orderinfo.setCardExpireTime(csmsnOrderinfo.getCardExpireTime());
+                orderinfo.setObuId(csmsnOrderinfo.getObuId());
+                orderinfo.setObuStatus(ObuStatus.fromCode(csmsnOrderinfo.getObuStatus()));
+                orderinfo.setObuEnableTime(csmsnOrderinfo.getObuEnableTime());
+                orderinfo.setObuExpireTime(csmsnOrderinfo.getObuExpireTime());
+                orderinfo.setActivationTime(csmsnOrderinfo.getActivationTime());
+                orderinfo.setDeliveryTime(csmsnOrderinfo.getDeliveryTime());
+                orderinfo.setCancelTime(csmsnOrderinfo.getCancelTime());
+                orderinfo.setReceivingTime(csmsnOrderinfo.getReceivingTime());
+                orderinfo.setReturnGoodsTime(csmsnOrderinfo.getReturnGoodsTime());
+                orderinfo.setCustomerId(csmsnOrderinfo.getCustomerId());
+                orderinfo.setCustomerIdType(IdType.findByCode(csmsnOrderinfo.getCustomerIdType()));
+                orderinfo.setCustomerIdNum(csmsnOrderinfo.getCustomerIdNum());
+                orderinfo.setCustomerName(csmsnOrderinfo.getCustomerName());
+                orderinfo.setCustomerTel(csmsnOrderinfo.getCustomerTel());
+                orderinfo.setCustomerIdVld(csmsnOrderinfo.getCustomerIdVld());
+                orderinfo.setAgentIdType(IdType.findByCode(csmsnOrderinfo.getAgentIdType()));
+                orderinfo.setAgentIdNum(csmsnOrderinfo.getAgentIdNum());
+                orderinfo.setAgentName(csmsnOrderinfo.getAgentName());
+                orderinfo.setVehicleId(csmsnOrderinfo.getVehicleId());
+                orderinfo.setVehiclePlate(csmsnOrderinfo.getVehiclePlate());
+                orderinfo.setVehiclePlateColor(csmsnOrderinfo.getVehiclePlateColor());
+                orderinfo.setVehicleClass(csmsnOrderinfo.getVehicleClass());
+                orderinfo.setVehicleType(csmsnOrderinfo.getVehicleType());
+                orderinfo.setVehicleAxleCount(csmsnOrderinfo.getVehicleAxleCount());
+                orderinfo.setOwnerName(csmsnOrderinfo.getOwnerName());
+                orderinfo.setOwnerIdNum(csmsnOrderinfo.getOwnerIdNum());
+                orderinfo.setOwnerIdType(IdType.findByCode(csmsnOrderinfo.getOwnerIdType()));
+                orderinfo.setCouponStatus(csmsnOrderinfo.getCouponStatus());
+                orderinfo.setMigrateData(csmsnOrderinfo.getMigrateData());
+                orderinfo.setDeviceType(csmsnOrderinfo.getDeviceType());
+                orderinfo.setInsertTime(csmsnOrderinfo.getInsertTime());
+                orderinfo.setUpdateTime(csmsnOrderinfo.getUpdateTime());
+                orderinfo.setQdOrderNo(csmsnOrderinfo.getQdOrderNo());
+                orderinfo.setProtocol(csmsnOrderinfo.getProtocol());
+                orderinfo.setReturnUrl(csmsnOrderinfo.getReturnUrl());
+                if (csmsnOrderinfo.getPlanSource() != null) {
+                    orderinfo.setPlatformSource(Integer.parseInt(csmsnOrderinfo.getPlanSource()));
+                }
+                orderinfo.setWxOpenedId(csmsnOrderinfo.getWxOpenedId());
+                orderinfo.setH5ReturnQdUrl(csmsnOrderinfo.getH5ReturnQdUrl());
+                orderinfo.setProtocolUrl(csmsnOrderinfo.getAgreementUrl());
+                issueOrderinfoRepo.persist(orderinfo);
+//                data.add(orderinfo);
+//                if (data.size() >= 1000){
+//                    logger.info("数量{}",i);
+//                    logger.info("开始批量插入====");
+//                    issueOrderinfoRepo.persistAll(data);
+//                    data = Lists.newArrayList();
+//                }
+            } catch (Exception e){
+                ErrorLog errorLog = new ErrorLog();
+                errorLog.setInfo(e.getMessage());
+                errorLog.setOrderNo(orderinfo.getOrderNo());
+                errorLogRepo.persist(errorLog);
+                logger.error("批量插入异常第{}条{}",i,e);
+                err.add(orderinfo.getOrderNo());
+            }
+        }
+//        try {
+//            issueOrderinfoRepo.persistAll(data);
+//        } catch (Exception e){
+//            logger.error("最后批量插入异常{}",i);
+//
+//            err.add(data);
+//            data = Lists.newArrayList();
+//        }
+
+        System.out.println("结束=====================");
+        System.out.println(err);
+
+    }
+
+
+
+
+