Merge branch 'master' of http://git.ds-bay.com/project/ccnet-wx-mp3.0

src/main/java/com/emato/ccnet/wx/biz/WxOrderBiz.java

@@ -0,0 +1,12 @@
+package com.emato.ccnet.wx.biz;
+
+import com.emato.ccnet.wx.support.msg.resp.ResponseMessage;
+
+public interface WxOrderBiz {
+    /**
+     *
+     * @return
+     */
+    ResponseMessage resendQueryAll();
+
+}

src/main/java/com/emato/ccnet/wx/biz/req/order/csp/Ceb311OrderBiz.java

@@ -53,7 +53,7 @@ public class Ceb311OrderBiz implements CebReqBiz {
         //查询中网电子订单数据
         List list = ceb311OrderGetDate.getData(reqParam);
         if (list.isEmpty()) {
-            String info = "【CEB311】没有订单数据, 生成海关支付单报文提前结束";
+            String info = "【CEB311】没有订单数据, 提前结束";
             LOGGER.error("--- {}", info);
             afterFailed(list);
             return ResponseMessage.failed(info);
@@ -62,7 +62,7 @@ public class Ceb311OrderBiz implements CebReqBiz {
         //添加erp电子订单数据
         ResponseMessage responseMessage = ceb311OrderAddDate.addDate(list);
         if(!ResponseMessage.isSuccess(responseMessage)){
-            String info = "生成海关支付单初始化失败" + responseMessage.getMsg();
+            String info = "生成海关电子订单初始化失败" + responseMessage.getMsg();
             LOGGER.error("--- {}", info);
             afterFailed(list);
             return ResponseMessage.failed(info);

src/main/java/com/emato/ccnet/wx/biz/req/waybill/oms/Ceb511OmsWayAddDate.java

@@ -27,7 +27,7 @@ public class Ceb511OmsWayAddDate implements CebReqAddDate {
         //运单数据的初始化
         int cusWaybill = cusWaybillService.addCusWaybill(list);
         if(cusWaybill != 1){
-            String info = "初始化批量海关支付单记录新增失败";
+            String info = "初始化批量海关运单记录新增失败";
             LOGGER.error("--- {}", info);
             return ResponseMessage.failed();
         }

src/main/java/com/emato/ccnet/wx/biz/req/waybill/oms/Ceb511SendDateRequest.java

@@ -68,7 +68,7 @@ public class Ceb511SendDateRequest implements CebReqSendDate{
         //查找当前ccnet中的所有电子订单
         List<CusWaybill> cusWaybills = cusWaybillService.findAllCusWaybill();
         if(cusWaybills == null){
-            String info = "查找当前ccnet中的所有电子订单失败";
+            String info = "查找当前ccnet中的所有运单失败";
             LOGGER.error("--- {}", info);
             return ResponseMessage.failed(info);
         }

src/main/java/com/emato/ccnet/wx/biz/req/wxorder/order/WxOrderResendBiz.java

@@ -0,0 +1,59 @@
+package com.emato.ccnet.wx.biz.req.wxorder.order;
+
+import com.emato.ccnet.wx.biz.CebReqBiz;
+import com.emato.ccnet.wx.biz.WxOrderBiz;
+import com.emato.ccnet.wx.contants.CcnetContants;
+import com.emato.ccnet.wx.dao.entity.ccnet.WxOrder;
+import com.emato.ccnet.wx.dao.entity.wx.WxOrderDate;
+import com.emato.ccnet.wx.service.WxOrderGrabService;
+import com.emato.ccnet.wx.service.WxOrderService;
+import com.emato.ccnet.wx.support.msg.resp.ResponseMessage;
+import com.emato.ccnet.wx.util.DateUtil;
+import com.google.common.collect.ImmutableMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class WxOrderResendBiz implements WxOrderBiz {
+    private static final Logger LOGGER = LoggerFactory.getLogger(WxOrderResendBiz.class);
+
+    @Autowired
+    private WxOrderService wxOrderService;
+
+   @Value("${db.wx-send-ccnet.page-size}")
+   private String limit = "20";
+
+    /**
+     * wx订单运单、电子订单、支付单发送失败数据
+     * @return
+     */
+    @Override
+    public ResponseMessage resendQueryAll() {
+//        "number", Integer.valueOf(limit),
+        Map<String,Object> reqParam = ImmutableMap.of(
+                "clecOrderStatus", CcnetContants.sendStatus.item_3.getItem(),"wayOrderStatus", CcnetContants.sendStatus.item_3.getItem(),
+                "playOrderStatus", CcnetContants.sendStatus.item_3.getItem(),"projectCheckStatus", CcnetContants.sendStatus.item_3.getItem());
+        //查询待处理数据
+        List<WxOrder> list = wxOrderService.getResendWxOrder(reqParam);
+        if (list == null || list.size() == 0) {
+            String info = "微信端没有运单、电子订单、支付单发送失败的订单数据, 提前结束";
+            LOGGER.error("--- {}", info);
+            return ResponseMessage.failed(info);
+        }
+        for (WxOrder order : list){
+//            System.out.println(order.getPlaceOrderlTime());
+//            System.out.println(DateUtil.dateToString(order.getPlaceOrderlTime(),DateUtil.yyyy_MM_ddHHmmss));
+//            System.out.println(DateUtil.stringConvertDate(DateUtil.dateToString(order.getPlaceOrderlTime(),DateUtil.yyyy_MM_ddHHmmss),DateUtil.yyyy_MM_ddHHmmss));
+            order.setPlaceOrderlTimeStr(DateUtil.dateToString(order.getPlaceOrderlTime(),DateUtil.yyyy_MM_ddHHmmss));
+        }
+
+        return ResponseMessage.success(list);
+    }
+
+}

src/main/java/com/emato/ccnet/wx/controller/WxOrderController.java

@@ -3,6 +3,7 @@ package com.emato.ccnet.wx.controller;
 import com.emato.ccnet.wx.biz.req.order.csp.Ceb311CustiomsResponse;
 import com.emato.ccnet.wx.biz.req.order.csp.Ceb311OrderBiz;
 import com.emato.ccnet.wx.biz.req.wxorder.order.WxOrderGrabBiz;
+import com.emato.ccnet.wx.biz.req.wxorder.order.WxOrderResendBiz;
 import com.emato.ccnet.wx.biz.req.wxorder.ordergoods.WxOrderGoodsGrabBiz;
 import com.emato.ccnet.wx.manager.result.Result;
 import com.emato.ccnet.wx.support.msg.resp.ResponseMessage;
@@ -21,6 +22,9 @@ public class WxOrderController {
     private WxOrderGrabBiz wxOrderGrabBiz;
     @Autowired
     private WxOrderGoodsGrabBiz wxOrderGoodsGrabBiz;
+    @Autowired
+    private WxOrderResendBiz wxOrderResendBiz;
+
 
     @RequestMapping("/wx/wxOrderBill")
     public ResponseMessage wxOrderGrab() {
@@ -38,4 +42,16 @@ public class WxOrderController {
         return result;
     }
 
+    /**
+     * 新增wx订单运单、电子订单、支付单发送失败查询接口，提供给小程序后台查询订单重发功能
+     * @return
+     */
+    @RequestMapping("/wx/wxOrderResendQueryAll")
+    public ResponseMessage wxOrderResendQueryAll() {
+        LOGGER.info("---------- wx订单运单、电子订单、支付单发送失败数据开始 ----------------------------------------");
+        ResponseMessage result = wxOrderResendBiz.resendQueryAll();
+        LOGGER.info("---------- wx订单运单、电子订单、支付单发送失败数据结束 ----------------------------------------");
+        return result;
+    }
+
 }

src/main/java/com/emato/ccnet/wx/dao/entity/ccnet/WxOrder.java

@@ -147,12 +147,23 @@ public class WxOrder implements Serializable {
 
     private String exprAgreementType;
 
+    private String placeOrderlTimeStr;
+
     private static final long serialVersionUID = 1L;
 
     public WxOrder() {
         super();
     }
 
+    public String getPlaceOrderlTimeStr() {
+        return placeOrderlTimeStr;
+    }
+
+    public void setPlaceOrderlTimeStr(String placeOrderlTimeStr) {
+        this.placeOrderlTimeStr = placeOrderlTimeStr;
+    }
+
+
     public String getExprAgreementType() {
         return exprAgreementType;
     }
@@ -720,4 +731,4 @@ public class WxOrder implements Serializable {
     public void setExField5(String exField5) {
         this.exField5 = exField5 == null ? null : exField5.trim();
     }
-}
+}

src/main/java/com/emato/ccnet/wx/dao/mapper/ccnet/WxOrderMapper.java

@@ -29,4 +29,6 @@ public interface WxOrderMapper {
     int updateWxOrderStatus(Map<String, Object> wxMap);
 
     WxOrder getWxOrderByOrderSn(String merchOrderId);
-}
+
+    List<WxOrder> getResendWxOrder(Map<String, Object> param);
+}

src/main/java/com/emato/ccnet/wx/service/WxOrderService.java

@@ -25,4 +25,6 @@ public interface WxOrderService {
     int updateWxOrderStatus(Map<String, Object> wxMap);
 
     WxOrder getWxOrderByOrderSn(String merchOrderId);
-}
+
+    List<WxOrder> getResendWxOrder(Map<String, Object> param);
+}

src/main/java/com/emato/ccnet/wx/service/impl/WxOrderServiceImpl.java

@@ -42,7 +42,7 @@ public class WxOrderServiceImpl implements WxOrderService {
     public WxOrder add(WxOrder record) {
         record.setCreateTime(new Date());
         if(this.wxOrderMapper.insertSelective(record)==1) {
-            	return record; 
+            	return record;
         }
         return null;
     }
@@ -267,4 +267,9 @@ public class WxOrderServiceImpl implements WxOrderService {
     public WxOrder getWxOrderByOrderSn(String merchOrderId) {
         return wxOrderMapper.getWxOrderByOrderSn(merchOrderId);
     }
-}
+
+    @Override
+    public List<WxOrder> getResendWxOrder(Map<String, Object> param) {
+        return wxOrderMapper.getResendWxOrder(param);
+    }
+}

src/main/resources/mybatis/mapper/ccnet/biz/WxOrderBizMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.emato.ccnet.wx.dao.mapper.ccnet.WxOrderMapper" >
   <select id="getWxOrderByWxOrderId" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from wx_order
     where wx_order_id = #{wxOrderId,jdbcType=VARCHAR}
@@ -488,4 +488,21 @@
         where order_sn = #{orderSn,jdbcType=VARCHAR}
     </select>
 
-</mapper>
+
+    <select id="getResendWxOrder" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from wx_order where 1 = 1
+        <if test="wxOrderDetail != null">
+            and wx_order_detail = #{wxOrderDetail,jdbcType=CHAR}
+        </if>
+        <if test="buyerPayCheck != null">
+            and buyer_pay_check = #{buyerPayCheck,jdbcType=CHAR}
+        </if>
+        <if test="clecOrderStatus != null and wayOrderStatus != null and playOrderStatus != null and projectCheckStatus != null">
+            and (clec_order_status = #{clecOrderStatus,jdbcType=CHAR} or way_order_status = #{wayOrderStatus,jdbcType=CHAR}
+            or play_order_status = #{playOrderStatus,jdbcType=CHAR} or project_check_status = #{projectCheckStatus,jdbcType=CHAR})
+        </if>
+        ORDER BY wx_order_sn
+    </select>
+</mapper>