Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/SettlementWorkerLogicVO.java

@@ -1,6 +1,8 @@
 package com.gree.mall.manager.bean.settle;
 
 import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.SettlementGoodsTypeEnum;
+import com.gree.mall.manager.enums.SettlementTypeEnum;
 import com.gree.mall.manager.plus.entity.SettlementOrder;
 import com.gree.mall.manager.plus.entity.SettlementOrderItem;
 import io.swagger.annotations.ApiModel;
@@ -41,6 +43,10 @@ public class SettlementWorkerLogicVO  {
     @ApiModelProperty(value = "商品名称")
     private String goodsName;
 
+
+    @ApiModelProperty(value = "工单号")
+    private SettlementGoodsTypeEnum goodsType;
+
     @ZfireField(tbName = "b")
     @ApiModelProperty(value = "数量")
     private BigDecimal num;

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitSalesRetCMapper.java

@@ -47,6 +47,7 @@ public interface WebsitSalesRetCMapper {
     IPage<SettlementWorkerLogicVO> pageV3(Page page,@Param("ex") ZfireParamBean zfireParam,
                                           @Param("companyWechatIds")List<String> companyWechatIds
             ,@Param("orderBaseIds")List<String> orderBaseIds,
-            @Param("value")String value
+            @Param("value")String value,
+            @Param("mName")List<String> mName
                                           );
 }

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

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.enums;
+
+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  SettlementGoodsTypeEnum implements BaseEnum {
+    MCC("MCC","辅材"),
+    ACC("ACC","ACC");
+
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+
+    private final String remark;
+}

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

@@ -939,7 +939,7 @@ public class SettlementOrderLogic {
         IPage<SettlementWorkerLogicVO> settlementOrderLogicVOIPage = websitSalesRetCMapper.pageV3(new Page(zfireParamBean.getPageNum(),
                         zfireParamBean.getPageSize()),
                 zfireParam
-                , companyWechatIds,orderBaseIds,zfireParamBean.getValue());
+                , companyWechatIds,orderBaseIds,zfireParamBean.getValue(),mName);
 
         return settlementOrderLogicVOIPage;
     }

mall-server-api/src/main/resources/mapper/WebsitSalesCMapper.xml

@@ -222,6 +222,13 @@
             </foreach>
         </if>
 
+        <if test="mName != null and mName.size > 0">
+            AND b.goods_name IN
+            <foreach item="item" index="index" collection="mName" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="orderBaseIds != null and orderBaseIds.size > 0">
             AND a.worker_order_id IN
             <foreach item="item" index="index" collection="orderBaseIds" open="(" separator="," close=")">