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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -426,6 +426,17 @@ public class PayOrderLogic {
 
         workerOrder.setSource(commonLogic.getSource().equals("A")?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
 
+
+        if (!StringUtil.isEmpty(workerOrder.getWorkerOrderId())){
+            PgOrderBase pgOrderBase = pgOrderBaseService.getById(workerOrder.getWorkerOrderId());
+            if (pgOrderBase != null){
+                workerOrder.setSaleType(pgOrderBase.getSaleType());
+                workerOrder.setOrderSmallType(pgOrderBase.getOrderSmallType());
+                workerOrder.setOrderSmallTypeText(pgOrderBase.getOrderSmallTypeText());
+            }
+        }
+
+
         workerOrder.setPayTime(new Date());
         workerOrder.setPayType(payType);
         workerOrder.setUserId(currentCompanyWechat.getUserId());

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

@@ -43,9 +43,9 @@ public class SettlementWorkerLogicVO  {
     @ApiModelProperty(value = "商品名称")
     private String goodsName;
 
-
-    @ApiModelProperty(value = "工单号")
-    private SettlementGoodsTypeEnum goodsType;
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "收费类型")
+    private SettlementGoodsTypeEnum chargeType;
 
     @ZfireField(tbName = "b")
     @ApiModelProperty(value = "数量")

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

@@ -47,7 +47,6 @@ 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("mName")List<String> mName
+            @Param("value")String value
                                           );
 }

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

@@ -911,7 +911,7 @@ public class SettlementOrderLogic {
         List<String> websitIds = adminUser.getAdminWebsitIds();
 
         List<String> orderBaseIds = new ArrayList<>();
-        List<String> mName = new ArrayList<>();
+/*        List<String> mName = new ArrayList<>();
 
         List<PartsImport> partsImportList = partsImportService.lambdaQuery()
                 .select(PartsImport::getPartName)
@@ -923,7 +923,7 @@ public class SettlementOrderLogic {
                 .list();
 
         mName.addAll(partsImportList.stream().map(PartsImport::getPartName).collect(Collectors.toList()));
-        mName.addAll(chargeList.stream().map(WebsitNormCharge::getNormName).collect(Collectors.toList()));
+        mName.addAll(chargeList.stream().map(WebsitNormCharge::getNormName).collect(Collectors.toList()));*/
 
         if (!StringUtil.isEmpty(zfireParamBean.getStartTime())) {
             List<PgOrderBase> pgOrderBaseList = pgOrderBaseService.lambdaQuery()
@@ -939,7 +939,7 @@ public class SettlementOrderLogic {
         IPage<SettlementWorkerLogicVO> settlementOrderLogicVOIPage = websitSalesRetCMapper.pageV3(new Page(zfireParamBean.getPageNum(),
                         zfireParamBean.getPageSize()),
                 zfireParam
-                , companyWechatIds,orderBaseIds,zfireParamBean.getValue(),mName);
+                , companyWechatIds,orderBaseIds,zfireParamBean.getValue());
 
         return settlementOrderLogicVOIPage;
     }

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

@@ -222,12 +222,11 @@
             </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>
+        AND (
+        EXISTS ( SELECT 1 FROM parts_import c WHERE b.goods_name = c.part_name )
+        OR
+        EXISTS ( SELECT 1 FROM websit_norm_charge d WHERE b.goods_name = d.norm_name and d.norm_type = 'M')
+        )
 
         <if test="orderBaseIds != null and orderBaseIds.size > 0">
             AND a.worker_order_id IN