gongzuming
2024-08-27 f78f3cd1cbc8547896bb4e0956c895780d392c96
微信发货、确认收货
已修改6个文件
68 ■■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/payment/OrderService.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/payment/OrderMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/表设计-二期.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
@@ -132,4 +132,7 @@
    @ApiModelProperty(value = "是否可质检退款")
    private boolean couldCheckRefund;
    @ApiModelProperty(value = "支付单号")
    private String paymentTrId;
}
src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
@@ -82,4 +82,7 @@
    @ApiModelProperty(value = "快递单号")
    private String deliveryNo;//快递单号
    @ApiModelProperty(value = "支付单号")
    private String paymentTrId;
}
src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java
@@ -18,6 +18,8 @@
public interface OrderMapper extends BaseMapper<Order> {
    void setPartnerOrderReceive();
    List<Order> getPartnerOrderReceive();
    List<OrderStatusCountDTO> getOrderStatusCount(@Param("condition") OrderQueryDTO dto);
    List<OrderListDTO> selectOrderList(Page page, @Param("condition") OrderQueryDTO dto);
@@ -33,4 +35,5 @@
    List<Order> getOrderForBill(@Param("startTime")LocalDateTime startTime
            , @Param("endTime")LocalDateTime endTime);
}
src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -519,7 +519,27 @@
     * 合伙人订单定时发货
     */
    public void setPartnerOrderSend() {
        orderMapper.setPartnerOrderReceive();
        List<Order> orders = orderMapper.getPartnerOrderReceive();
        if(orders == null || orders.size() == 0){
            return;
        }
        for (Order o : orders) {
            //set status_backend = 'RECEIVE', status = 'RECEIVE'
            o.setStatusBackend("RECEIVE");
            o.setStatus("RECEIVE");
            //发送微信发货请求
            JSONObject jsonObject = sendWxDeliveryGood(o);
            if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
                o.setWxDeliveryGood(true);
                o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
            } else {
                o.setWxDeliveryGood(false);
                o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
            }
            orderMapper.updateById(o);
        }
        //orderMapper.setPartnerOrderReceive();
    }
    /**
@@ -539,6 +559,17 @@
        o.setStatus(Constants.ORDER_STATUS.RECEIVE.name());
        o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
        o.update(SecurityUtils.getUserId());
        //发送微信发货请求
        JSONObject jsonObject = sendWxDeliveryGood(o);
        if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
            o.setWxDeliveryGood(true);
            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
        } else {
            o.setWxDeliveryGood(false);
            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
        }
        orderMapper.updateById(o);
    }
@@ -787,17 +818,6 @@
            o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.EVALUATE.name());
            o.setReceiveTime(LocalDateTime.now());
            o.update("sys");
            //发送微信发货请求
            JSONObject jsonObject = sendWxDeliveryGood(o);
            if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
                o.setWxDeliveryGood(true);
                o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
            } else {
                o.setWxDeliveryGood(false);
                o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
            }
            orderMapper.updateById(o);
        }
@@ -860,17 +880,6 @@
        o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.EVALUATE.name());
        o.setReceiveTime(LocalDateTime.now());
        o.update(userId);
        //发送微信发货请求
        JSONObject jsonObject = sendWxDeliveryGood(o);
        if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
            o.setWxDeliveryGood(true);
            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
        } else {
            o.setWxDeliveryGood(false);
            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
        }
        orderMapper.updateById(o);
    }
src/main/resources/mapper/payment/OrderMapper.xml
@@ -7,6 +7,10 @@
        where status_backend = 'SEND' and partner_id is not null
    </update>
    <select id="getPartnerOrderReceive" resultType="com.mzl.flower.entity.payment.Order">
        select * from t_order t where status_backend = 'SEND' and partner_id is not null
    </select>
    <select id="getOrderStatusCount" resultType="com.mzl.flower.dto.response.payment.OrderStatusCountDTO">
        SELECT q.status_backend value, count(1) orderCount
        FROM t_order q
src/main/表设计-二期.xlsx
Binary files differ