Forráskód Böngészése

状态变更以及对应状态时间 kwaixiaodian_order_cursor_list

zhaoxian 7 hónapja
szülő
commit
5e4a09bc9e

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -2253,7 +2253,7 @@ public class SupplyChainController extends BaseController {
                             if ("kwaishop_order_addOrder".equals(event)) {
                                 orderCursorListService.insertKWaiShopOrder(eventJSon);
                             } else if (EVENT_LIST.contains(event)) {
-                                logger.info("-KWaiShop----报文------------\n{}",eventJSon);
+//                                logger.info("-KWaiShop----报文------------\n{}",eventJSon);
                                 //状态变更以及对应状态时间 kwaixiaodian_order_cursor_list
                                 orderCursorListService.updateKWaiShopOrderStatus(eventJSon);
                             }

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KwaixiaodianOrderCursorListMapper.java

@@ -20,7 +20,7 @@ public interface KwaixiaodianOrderCursorListMapper {
 
     void insertKWaixiaodianOrderCursorList(@Param("order") KwaixiaodianOrderCursorList order);
 
-    int updateKWaiShopOrderStatus(@Param("oid") Long oid, @Param("status") Integer status);
+    int updateKWaiShopOrderStatus(Map<String, Object> map);
 
     KwaixiaodianShopScore getScore(@Param("shopId") String shopId);
 

+ 21 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KwaixiaodianOrderCursorListServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -215,9 +216,28 @@ public class KwaixiaodianOrderCursorListServiceImpl implements IKwaixiaodianOrde
         try {
             JSONObject info = eventJSon.getJSONObject("info");
             if (!Check.isNull(info)) {
+                Map<String, Object> map = new HashMap<>();
+                Long createTime = eventJSon.getLong("createTime");
+                if (!Check.isNull(createTime)) {
+                    Long time = Long.valueOf(DateUtils.timestamptoStr(createTime));
+                    map.put("time", time);
+                }
                 Long oid = info.getLong("oid");
                 Integer status = info.getInteger("status");
-                int i = mapper.updateKWaiShopOrderStatus(oid, status);
+                map.put("oid", oid);
+                map.put("status", status);
+                String event = eventJSon.getString("event");
+                if ("kwaishop_order_paySuccess".equals(event)) {
+                    //已支付消息
+                    map.put("field", "pay_time");
+                } else if ("kwaishop_order_delivering".equals(event)) {
+                    //已发货消息
+                    map.put("field", "send_time");
+                } else if ("kwaishop_order_deliverySuccess".equals(event)) {
+                    //已收货消息
+                    map.put("field", "recv_time");
+                }
+                int i = mapper.updateKWaiShopOrderStatus(map);
                 if (i <= 0) {
                     log.error("KWai_订单ID:{},状态:{} 修改失败", oid, status);
                 }

+ 5 - 0
ruixuan-live/src/main/resources/mapper/isc/KwaixiaodianOrderCursorListMapper.xml

@@ -418,6 +418,11 @@
     <update id="updateKWaiShopOrderStatus">
         UPDATE `ruixuan`.kwaixiaodian_order_cursor_list
         SET status = #{status}
+        <choose>
+            <when test="field !=null and field !='' ">
+                ,${field} =#{time}
+            </when>
+        </choose>
         WHERE oid = #{oid}
     </update>