Bläddra i källkod

bug修改,功能优化

1018653686@qq.com 1 år sedan
förälder
incheckning
d166d146a0

+ 3 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/po/JdOrder.java

@@ -149,4 +149,7 @@ public class JdOrder extends BasePo {
     private String hasEx;
 
     private String remark;
+
+    /**处理状态;1=未处理;2=已处理**/
+    private String handleStatus;
 }

+ 1 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdApiServiceImpl.java

@@ -633,6 +633,7 @@ public class JdApiServiceImpl implements JdApiService {
                         jdOrderDetailsList.addAll(jdOrderDetails);
                         if (hasExFlag.get()){
                             jdOrder.setHasEx(RunParamConstant.EXCEPTION);
+                            jdOrder.setHandleStatus(RunParamConstant.EXCEPTION_STATE_UNTREATED);
                             jdOrderService.updateById(jdOrder);
                         }
                     }

+ 1 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderDetailsServiceImpl.java

@@ -157,6 +157,7 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
             //修改采购单状态为已处理
             JdOrder jdOrder = jdOrderMapper.selectById(byId.getJdOrderId());
             jdOrder.setHasEx(RunParamConstant.NO_EXCEPTION);
+            jdOrder.setHandleStatus(RunParamConstant.EXCEPTION_STATE_TREATED);
             jdOrderMapper.updateById(jdOrder);
         }
     }

+ 2 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -125,6 +125,8 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         wrapper.in(CollectionUtil.isNotEmpty(jdOrderIdList), "jo.id", jdOrderIdList);
         wrapper.eq(StrUtil.isNotBlank(dto.getBusinessStatus()), "jo.business_status", dto.getBusinessStatus());
         wrapper.eq(ObjectUtil.isNotNull(dto.getIsCanConfirm()), "jo.is_can_confirm", dto.getIsCanConfirm());
+        wrapper.eq(StrUtil.isNotBlank(dto.getHandleStatus()), "jo.handle_status", dto.getHandleStatus());
+
         wrapper.eq("jo", JdOrder::getState, dto.getState());
         wrapper.eq("jo", JdOrder::getConfirmState, dto.getConfirmState());
         //是否异常

+ 2 - 1
hx-victoriatourist/src/main/resources/mapper/jd/JdOrderMapper.xml

@@ -56,7 +56,8 @@
             jo.tc_flag_name,
             jo.book_time,
             jo.has_ex,
-            jo.remark
+            jo.remark,
+            jo.handle_status
         from jd_order jo
             <!--LEFT JOIN jd_order_details jod ON jod.jd_order_id = jo.id
             LEFT JOIN bytesailing_item.product_info pi ON jod.product_id = pi.id