搜索，代码整合

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdOrderSelectDto.java

@@ -35,4 +35,10 @@ public class JdOrderSelectDto extends BaseSelectDto {
 
     /**确认状态**/
     private String businessStatus;
+
+    /**订单状态**/
+    private Integer state;
+
+    /**回告状态**/
+    private Integer confirmState;
 }

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

@@ -130,10 +130,24 @@ public class JdApiServiceImpl implements JdApiService {
             throw new RuntimeException(e);
         }
         String code = response.getCode();
-        if(!"200".equals(code)){
+        if(!"0".equals(code)){
             //失败
             log.error("回告失败：{}，{}",response.getZhDesc(), response.getMsg());
             throw new RuntimeException("回告失败");
+        }else {
+            Boolean successFlag = false;
+            String msg = "回告失败";
+            try{
+                successFlag = JSONObject.parse(response.getMsg()).getJSONObject("jingdong_vc_confirmpurchaseorder_responce").getJSONObject("base_result").getBoolean("success");
+                msg = msg + "：" + JSONObject.parse(response.getMsg()).getJSONObject("jingdong_vc_confirmpurchaseorder_responce").getJSONObject("base_result").getString("result_message");
+            }catch (Exception e){
+                log.error("回告返回解析异常：{}",response.getMsg());
+            }
+            if(!successFlag){
+                //失败
+                log.error("回告失败：{}，{}",response.getZhDesc(), response.getMsg());
+                throw new RuntimeException(msg);
+            }
         }
     }
 

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

@@ -126,14 +126,16 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         wrapper.like(ObjectUtil.isNotNull(dto.getWareId()),"jod.ware_id",dto.getWareId());
         wrapper.eq(StrUtil.isNotBlank(dto.getBusinessStatus()),"jo.business_status",dto.getBusinessStatus());
         wrapper.eq(ObjectUtil.isNotNull(dto.getIsCanConfirm()),"jo.is_can_confirm",dto.getIsCanConfirm());
-
-        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
-            wrapper.keyword(dto.getKeyword(),
-                    new SqlField("jo", JdOrderVo::getCode)
-//                    new SqlField("pi.custom_code"),
-//                    new SqlField("pi.name")
-            );
-        }
+        wrapper.eq("jo", JdOrder::getState, dto.getState());
+        wrapper.eq("jo", JdOrder::getConfirmState, dto.getConfirmState());
+
+//        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+//            wrapper.keyword(dto.getKeyword(),
+//                    new SqlField("jo", JdOrderVo::getCode)
+////                    new SqlField("pi.custom_code"),
+////                    new SqlField("pi.name")
+//            );
+//        }
 //
 //        //添加权限过滤
 //        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
@@ -674,11 +676,11 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
     @Transactional(rollbackFor = Exception.class)
     public void tellBackOrer(JdOrderDto jdOrderDto) {
         TellBackOrderVO tellBackOrderVO = new TellBackOrderVO();
-        tellBackOrderVO.setOrderId(jdOrderDto.getId());
+        tellBackOrderVO.setOrderId(123L);
         tellBackOrderVO.setDeliveryTime(jdOrderDto.getDeliveryTime());
         List<TellBackOrderVO.BackInfo> backInfos = BeanUtil.copyToList(jdOrderDto.getJdOrderDetailsList(), TellBackOrderVO.BackInfo.class);
         tellBackOrderVO.setBackInfo(backInfos);
-//        jdApiService.tellBackOrer(tellBackOrderVO);
+        jdApiService.tellBackOrer(tellBackOrderVO);
         //修改订单状态
         lambdaUpdate()
                 .set(JdOrder::getBusinessStatus, 2)