no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsMVO.java

@@ -1,7 +1,7 @@
 package com.gree.mall.manager.bean.material.base;
 
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.JudgeEnum;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.material.StateEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -78,7 +78,7 @@ public class WebsitGoodsMVO {
 
 //    @ZfireField(hide = true)
     @ApiModelProperty(value = "是否入师傅库存")
-    private JudgeEnum manageWorkerStock;
+    private IsYesNoEnum manageWorkerStock;
 
     @ApiModelProperty(value = "备注")
     private String remark;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitTradeVO.java

@@ -1,7 +1,11 @@
 package com.gree.mall.manager.bean.material.manage;
 
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.*;
+import com.gree.mall.manager.enums.IsYesNoEnum;
+import com.gree.mall.manager.enums.material.PayOrderTypeEnum;
+import com.gree.mall.manager.enums.material.PayTypeEnum;
+import com.gree.mall.manager.enums.material.SalesPayOrderSourceEnum;
+import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,7 +37,7 @@ public class WebsitTradeVO {
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "订单来源")
-    private OrderSourceEnum orderSource;
+    private SalesPayOrderSourceEnum orderSource;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
@@ -58,7 +62,7 @@ public class WebsitTradeVO {
     private PayTypeEnum payType;
 
     @ApiModelProperty(value = "是否已支付")
-    private JudgeEnum payFlag;
+    private IsYesNoEnum payFlag;
 
 //    @ApiModelProperty(value = "支付订单生成时间")
 //    private Date orderCreateTime;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/vender/WebsitVenderGoodsRelaVO.java

@@ -1,7 +1,7 @@
 package com.gree.mall.manager.bean.material.vender;
 
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.JudgeEnum;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.material.StateEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -84,7 +84,7 @@ public class WebsitVenderGoodsRelaVO {
 
     @ZfireField(tbName = "b", hide = true)
     @ApiModelProperty(value = "是否入师傅库存")
-    private JudgeEnum manageWorkerStock;
+    private IsYesNoEnum manageWorkerStock;
 
     @ZfireField(tbName = "b", hide = true)
     @ApiModelProperty(value = "进价范围最小")

mall-server-api/src/main/java/com/gree/mall/manager/enums/material/JudgeEnum.java

@@ -1,22 +0,0 @@
-package com.gree.mall.manager.enums.material;
-
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.fasterxml.jackson.annotation.JsonValue;
-import com.gree.mall.manager.enums.base.BaseEnum;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-public enum JudgeEnum implements BaseEnum {
-    YES("YES","是"),
-    NO("NO","否");
-
-    @EnumValue
-    @JsonValue
-    private final String key;
-
-    private final String remark;
-}

mall-server-api/src/main/java/com/gree/mall/manager/enums/material/OrderSourceEnum.java → mall-server-api/src/main/java/com/gree/mall/manager/enums/material/SalesPayOrderSourceEnum.java

@@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-public enum OrderSourceEnum implements BaseEnum {
+public enum SalesPayOrderSourceEnum implements BaseEnum {
     M_SALES("M_SALES","辅材销售订单"),
     P_SALES("P_SALES","配件销售订单"),
     SALES_RET("SALES_RET","辅材销售退货"),

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WebsitGoodsLogic.java

@@ -13,7 +13,7 @@ import com.gree.mall.manager.bean.material.base.WebsitGoodsMVO;
 import com.gree.mall.manager.bean.material.base.WebsitGoodsPVO;
 import com.gree.mall.manager.commonmapper.MaterialMapper;
 import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.material.JudgeEnum;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.material.NormTypeEnum;
 import com.gree.mall.manager.enums.material.StateEnum;
 import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
@@ -519,10 +519,10 @@ public class WebsitGoodsLogic {
 
             goods.setGoodsStockUnit(StrUtil.trim(unitStr));
             goods.setGoodsSalesUnit(StrUtil.trim(saleUnitStr));
-            if (StringUtils.isBlank(manageWorkerStock) || manageWorkerStock.equals(JudgeEnum.YES.getRemark())) {
-                goods.setManageWorkerStock(JudgeEnum.YES.getKey());
+            if (StringUtils.isBlank(manageWorkerStock) || manageWorkerStock.equals(IsYesNoEnum.YES.getRemark())) {
+                goods.setManageWorkerStock(IsYesNoEnum.YES.getKey());
             } else {
-                goods.setManageWorkerStock(JudgeEnum.NO.getKey());
+                goods.setManageWorkerStock(IsYesNoEnum.NO.getKey());
             }
 
             if (StringUtils.isNotBlank(salesConvertQty)) {
@@ -712,7 +712,7 @@ public class WebsitGoodsLogic {
             goods.setGoodsStockUnit(StrUtil.trim(unitStr));
             goods.setGoodsSalesUnit(StrUtil.trim(unitStr));
             goods.setMaterialGroupName(StrUtil.trim(materialGroupName));
-            goods.setManageWorkerStock(JudgeEnum.YES.getKey());
+            goods.setManageWorkerStock(IsYesNoEnum.YES.getKey());
             goods.setNormType(NormTypeEnum.M.getKey());
             goods.setPartType(partType);
 
@@ -810,7 +810,7 @@ public class WebsitGoodsLogic {
             // 库存单位与销售单位一致
             goods.setGoodsStockUnit(StrUtil.trim(unitStr));
             goods.setGoodsSalesUnit(StrUtil.trim(unitStr));
-            goods.setManageWorkerStock(JudgeEnum.YES.getKey());
+            goods.setManageWorkerStock(IsYesNoEnum.YES.getKey());
             goods.setNormType(NormTypeEnum.S.getKey());
 
             goodsList.add(goods);

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -522,7 +522,7 @@ public class WebsitPartsSalesOrderLogic {
                 .setAppid(payConfig.getAppid())
                 .setOrderType(PayOrderTypeEnum.S.getKey())
                 .setRunTime(DateUtil.offsetSecond(DateUtil.date(), 15))
-                .setOrderSource(OrderSourceEnum.P_SALES.getKey())
+                .setOrderSource(SalesPayOrderSourceEnum.P_SALES.getKey())
                 .setIsDeliver(false);
 
 
@@ -564,6 +564,23 @@ public class WebsitPartsSalesOrderLogic {
 
 
         websitPartsSalesService.saveOrUpdate(partsSalesOrderBean);
+
+        new WebsitSalesPayOrder()
+                .setCompanyWechatId(partsSalesOrderBean.getCompanyWechatId())
+                .setCompanyWechatName(partsSalesOrderBean.getCompanyWechatName())
+                .setGoodsType(WebsitGoodsTypeEnum.P.getKey())
+                .setWebsitId(partsSalesOrderBean.getWebsitId())
+                .setWebsitName(partsSalesOrderBean.getWebsitName())
+                .setOrderId(partsSalesOrderBean.getId())
+                .setPayType(PayTypeEnum.CASH.getKey())
+                .setPayFlag(IsYesNoEnum.YES.getKey())
+                .setOrderCreateTime(partsSalesOrderBean.getCreateTime())
+                .setPayValue(partsSalesOrderBean.getTotalAmount())
+                .setPayTime(DateUtil.date())
+                .setOrderType(PayOrderTypeEnum.S.getKey())
+                .setOrderSource(SalesPayOrderSourceEnum.P_SALES.getKey())
+                .insert();
+
         return partsSalesOrderBean;
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitSalesLogic.java

@@ -412,7 +412,7 @@ public class WebsitSalesLogic {
         if (sales.getPayType().equals(PayTypeEnum.CASH.getKey())
                 || sales.getPayType().equals(PayTypeEnum.ENGIN.getKey())) {
             sales.setFlag(MaterialSalesFlagEnum.PAY_NOT_TAKE.getKey())
-                    .setPayFlag(JudgeEnum.YES.getKey());
+                    .setPayFlag(IsYesNoEnum.YES.getKey());
 
             if (sales.getPayType().equals(PayTypeEnum.CASH.getKey())) {
                 // 生成现金支付记录
@@ -424,11 +424,11 @@ public class WebsitSalesLogic {
                 order.setWebsitName(sales.getWebsitName());
                 order.setOrderId(sales.getSalesId());
                 order.setPayType(PayTypeEnum.CASH.getKey());
-                order.setPayFlag(JudgeEnum.YES.getKey());
+                order.setPayFlag(IsYesNoEnum.YES.getKey());
                 order.setPayTime(sales.getSubmitTime());
                 order.setPayValue(sales.getTotalAmount());
                 order.setOrderType(PayOrderTypeEnum.S.getKey());
-                order.setOrderSource(sales.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) ? OrderSourceEnum.M_SALES.getKey() : OrderSourceEnum.P_SALES.getKey());
+                order.setOrderSource(sales.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) ? SalesPayOrderSourceEnum.M_SALES.getKey() : SalesPayOrderSourceEnum.P_SALES.getKey());
                 order.insert();
             }
 
@@ -536,6 +536,22 @@ public class WebsitSalesLogic {
             websitGoodsMangerLogic.givePrice(sales.getTotalAmount(), sales.getOrderEnginBaseId(), null, null, salesId, sales.getGoodsType());
             websitGoodsMangerLogic.upManage(sales.getOrderEnginBaseId(), sales.getGoodsType());
         }
+
+        // 生成现金支付记录
+        WebsitSalesPayOrder order = new WebsitSalesPayOrder();
+        order.setCompanyWechatId(sales.getCompanyWechatId());
+        order.setCompanyWechatName(sales.getCompanyWechatName());
+        order.setGoodsType(sales.getGoodsType());
+        order.setWebsitId(sales.getWebsitId());
+        order.setWebsitName(sales.getWebsitName());
+        order.setOrderId(sales.getSalesId());
+        order.setPayType(PayTypeEnum.CASH.getKey());
+        order.setPayFlag(IsYesNoEnum.YES.getKey());
+        order.setPayTime(sales.getSubmitTime());
+        order.setPayValue(sales.getTotalAmount());
+        order.setOrderType(PayOrderTypeEnum.S.getKey());
+        order.setOrderSource(sales.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) ? SalesPayOrderSourceEnum.M_SALES.getKey() : SalesPayOrderSourceEnum.P_SALES.getKey());
+        order.insert();
     }
 
     public List<WebsitSalesCategoryVO> existStockCategory(String websitId) {
@@ -646,7 +662,7 @@ public class WebsitSalesLogic {
                 .setAppid(payConfig.getAppid())
                 .setOrderType(PayOrderTypeEnum.S.getKey())
                 .setRunTime(DateUtil.offsetSecond(DateUtil.date(), 15))
-                .setOrderSource(sales.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) ? OrderSourceEnum.M_SALES.getKey() : OrderSourceEnum.P_SALES.getKey())
+                .setOrderSource(sales.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) ? SalesPayOrderSourceEnum.M_SALES.getKey() : SalesPayOrderSourceEnum.P_SALES.getKey())
                 .setIsDeliver(false);
 
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/WebsitPartsRetLogic.java

@@ -14,6 +14,7 @@ import com.gree.mall.manager.bean.websit.WebsitPartsRetDetail;
 import com.gree.mall.manager.bean.websit.WebsitPartsRetVO;
 import com.gree.mall.manager.commonmapper.WebsitSalesRetCMapper;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.material.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
@@ -311,14 +312,14 @@ public class WebsitPartsRetLogic {
         order.setOriginOrderId(websitPartsRet.getSalesId());
         order.setOrderCreateTime(websitPartsRet.getCreateTime());
         order.setPayType(websitPartsRet.getPayType());
-        order.setPayFlag(JudgeEnum.YES.getKey());
+        order.setPayFlag(IsYesNoEnum.YES.getKey());
         order.setPayTime(websitPartsRet.getPayTime());
         order.setPayValue(websitPartsRet.getTotalRefundAmount());
         order.setOrderType(PayOrderTypeEnum.R.getKey());
         if (websitPartsRet.getType().equals("NEW")) {
-            order.setOrderSource(OrderSourceEnum.NEW_PARTS_RET.getKey());
+            order.setOrderSource(SalesPayOrderSourceEnum.NEW_PARTS_RET.getKey());
         } else {
-            order.setOrderSource(OrderSourceEnum.OLD_PARTS_RET.getKey());
+            order.setOrderSource(SalesPayOrderSourceEnum.OLD_PARTS_RET.getKey());
         }
 
         order.insert();

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/WebsitSalesRetLogic.java

@@ -15,6 +15,7 @@ import com.gree.mall.manager.bean.websit.WebsitSalesRetAddUP;
 import com.gree.mall.manager.bean.websit.WebsitSalesRetDetail;
 import com.gree.mall.manager.bean.websit.WebsitSalesRetVO;
 import com.gree.mall.manager.commonmapper.WebsitSalesRetCMapper;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.material.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
@@ -268,11 +269,11 @@ public class WebsitSalesRetLogic {
         order.setOriginOrderId(websitSalesRet.getSalesId());
         order.setOrderCreateTime(websitSalesRet.getCreateTime());
         order.setPayType(websitSalesRet.getPayType());
-        order.setPayFlag(JudgeEnum.YES.getKey());
+        order.setPayFlag(IsYesNoEnum.YES.getKey());
         order.setPayTime(websitSalesRet.getRetTime());
         order.setPayValue(websitSalesRet.getRetAmount());
         order.setOrderType(PayOrderTypeEnum.R.getKey());
-        order.setOrderSource(OrderSourceEnum.SALES_RET.getKey());
+        order.setOrderSource(SalesPayOrderSourceEnum.SALES_RET.getKey());
         order.insert();
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/schedule/AutoDeliverSchedule.java

@@ -91,7 +91,7 @@ public class AutoDeliverSchedule {
 //    public void task() throws Exception {
 //        List<WebsitSalesPayOrder> list = websitSalesPayOrderService.lambdaQuery()
 //                .eq(WebsitSalesPayOrder::getIsDeliver, false)
-//                .in(WebsitSalesPayOrder::getOrderSource, OrderSourceEnum.M_SALES.getKey(),OrderSourceEnum.P_SALES.getKey())
+//                .in(WebsitSalesPayOrder::getOrderSource, SalesPayOrderSourceEnum.M_SALES.getKey(),SalesPayOrderSourceEnum.P_SALES.getKey())
 //                .le(WebsitSalesPayOrder::getPayTime, DateUtil.offsetMinute(new Date(), -5))
 //                .list();
 //        if(CollectionUtils.isEmpty(list)){