feat: 数据统计参数

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageService.java

@@ -54,6 +54,10 @@ public class InteractRecordMessageService {
         if (MaterialInteractRecordEventType.ORDER.getCode().equals(interactRecordMessageBO.getEventType())) {
             interactRecordBO = interactRecordService.queryLeastRecord(interactRecordMessageBO.getEnterpriseId(), interactRecordMessageBO.getClerkId(),
                     interactRecordMessageBO.getMaterialId(), interactRecordMessageBO.getMemberId());
+            if (interactRecordBO == null) {
+                log.info("下单事件 互动记录为空 {}", JSON.toJSONString(interactRecordMessageBO));
+                return;
+            }
         } else {
             interactRecordBO = interactRecordService.queryWithInteractInfo(interactRecordMessageBO.getEnterpriseId(), recordKey);
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/MallOrderStatusChangeApiServiceImpl.java

@@ -49,7 +49,7 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
         }
 
         Integer toStatus = orderEventMqBO.getToStatus();
-        if (OrderEnum.OrderNodeEnum.PAY_ORDER.getOrderStep().equals(toStatus)) {
+        if (!OrderEnum.OrderNodeEnum.PAY_ORDER.getOrderStep().equals(toStatus)) {
             log.info("订单事件不是支付事件 {}", toStatus);
             return ServiceResponse.success();
         }

haoban-manage3-service/src/test/java/InteractRecordMessageServiceTest.java

+import com.gic.haoban.manage.api.service.content.MallOrderStatusChangeApiService;
 import com.gic.haoban.manage.service.pojo.bo.content.message.InteractRecordMessageBO;
 import com.gic.haoban.manage.service.service.content.message.InteractRecordMessageService;
 import com.sun.org.apache.bcel.internal.generic.DADD;
@@ -23,6 +24,8 @@ public class InteractRecordMessageServiceTest {
 
     @Autowired
     InteractRecordMessageService interactRecordMessageService;
+    @Autowired
+    MallOrderStatusChangeApiService mallOrderStatusChangeApiService;
 
     String eid = "ff8080815dacd3a2015dacd3ef5c0000";
     String wxEid = "ca66a01b79474c40b3e7c7f93daf1a3b";
@@ -50,4 +53,11 @@ public class InteractRecordMessageServiceTest {
         interactRecordMessageBO.setLastAccessTime(new Date().getTime());
         interactRecordMessageService.dealRecord(interactRecordMessageBO);
     }
+
+
+    @Test
+    public void mallOrderStatusChangeTest(){
+        String params  ="{\"orderNumber\":\"6230408781099580\",\"toStatus\":2,\"fromStatus\":1,\"orderId\":\"c08691af8297480db3d25ef5ef19e863\",\"enterpriseId\":\"ff8080815dacd3a2015dacd3ef5c0000\",\"mqTraceId\":\"244806167-1-1680932807.425-/gic-thirdparty/wxmall_payment_result_notice\",\"memberId\":\"ff8080818147efc8018148d1759903c8\"}";
+        mallOrderStatusChangeApiService.mallOrderStatusChange(params);
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/MaterialDataAdaptor.java

@@ -149,11 +149,11 @@ public class MaterialDataAdaptor {
      * @param enterpriseId
      * @param storeIds
      * @param fixedDateDiff
-     * @param order
+     * @param orderStr
      * @return
      */
     public Page<MaterialClerkUsedDataVO> queryMaterialClerkUsedData(String enterpriseId, List<String> storeIds, Integer fixedDateDiff,
-                                                                    String orderField, Integer order, Integer pageNo, Integer pageSize) {
+                                                                    String orderField, String orderStr, Integer pageNo, Integer pageSize) {
         Map<String, Object> params = new HashMap<>();
         Map<String, Object> inlineParams = new HashMap<>();
         params.put("pageNo", pageNo);
@@ -162,8 +162,7 @@ public class MaterialDataAdaptor {
         inlineParams.put("enterpriseId", enterpriseId);
         inlineParams.put("fixedDateDiff", fixedDateDiff);
         if (StringUtils.isNotBlank(orderField)) {
-            String orderStr = new Integer(1).equals(order) ? " asc " : " desc ";
-            inlineParams.put("orderByField", orderField + orderStr);
+            inlineParams.put("orderByField", orderField + " " +orderStr);
         }
         if (CollectionUtil.isNotEmpty(storeIds)) {
             inlineParams.put("storeId", StringUtils.join(storeIds, ","));
@@ -186,11 +185,11 @@ public class MaterialDataAdaptor {
      * @param enterpriseId
      * @param storeIds
      * @param fixedDateDiff
-     * @param order
+     * @param orderStr
      * @return
      */
     public Page<MaterialStoreUsedDataVO> queryMaterialStoreUsedData(String enterpriseId, List<String> storeIds, Integer fixedDateDiff,
-                                                                    String orderField, Integer order, Integer pageNo, Integer pageSize) {
+                                                                    String orderField, String orderStr, Integer pageNo, Integer pageSize) {
         Map<String, Object> params = new HashMap<>();
         Map<String, Object> inlineParams = new HashMap<>();
         params.put("pageNo", pageNo);
@@ -200,13 +199,12 @@ public class MaterialDataAdaptor {
         inlineParams.put("enterpriseId", enterpriseId);
         inlineParams.put("fixedDateDiff", fixedDateDiff);
         if (StringUtils.isNotBlank(orderField)) {
-            String orderStr = new Integer(1).equals(order) ? " asc " : " desc ";
-            inlineParams.put("orderByField", orderField + orderStr);
+            inlineParams.put("orderByField", orderField + " " + orderStr);
         }
         if (CollectionUtil.isNotEmpty(storeIds)) {
             inlineParams.put("storeId", StringUtils.join(storeIds, ","));
         }
-        Map<String, Object> result = this.doHttp(JSON.toJSONString(params), MATERIAL_CLERK_DATA);
+        Map<String, Object> result = this.doHttp(JSON.toJSONString(params), MATERIAL_STORE_DATA);
         if (result.get("data") == null) {
             return new Page<>();
         }
@@ -232,7 +230,7 @@ public class MaterialDataAdaptor {
     public Page<MaterialPersonalUsedDataVO> queryMaterialClerkUsedReport(String enterpriseId, String clerkId,
                                                                          Integer reportType, List<String> storeIds,
                                                                          Integer pageNo, Integer pageSize,
-                                                                         String orderField, String order) {
+                                                                         String orderField, String orderStr) {
         // 获取当前时间周期
         DateTime startTime = null;
         DateTime endTime = null;
@@ -263,8 +261,7 @@ public class MaterialDataAdaptor {
             inlineParams.put("storeId", StringUtils.join(storeIds, ","));
         }
         if (StringUtils.isNotBlank(orderField)) {
-            String orderStr = new Integer(1).equals(order) ? " asc " : " desc ";
-            inlineParams.put("orderByField", orderField + orderStr);
+            inlineParams.put("orderByField", orderField + " " + orderStr);
         }
         Map<String, Object> result = this.doHttp(JSON.toJSONString(params), apolloKey);
         if (result.get("data") == null) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/statistics/MaterialAnalyzeDataQO.java

@@ -26,8 +26,8 @@ public class MaterialAnalyzeDataQO extends MaterialStatisticsBaseQO {
     private String orderByField;
 
     /**
-     * 1 生序
-     * 0 降序
+     * asc
+     * desc
      */
-    private Integer order;
+    private String order;
 }