Merge branch 'dev' of https://git.njzscloud.com/lzq/njzscloud into dev

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizInvoiceEntity.java

@@ -34,6 +34,11 @@ public class BizInvoiceEntity {
      */
     private String companyName;
 
+    /**
+     * 公司ID
+     */
+    private Long companyId;
+
     /**
      * 联系电话
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java

@@ -11,6 +11,9 @@ import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
 
+/**
+ * @author lzq
+ */
 @Getter
 @Setter
 @ToString
@@ -72,6 +75,9 @@ public class OrderPagingSearchParam {
     private LocalDateTime endTime;
     private OrderViewType type;
 
+    private LocalDateTime startPayTime;
+    private LocalDateTime endPayTime;
+
     private Boolean isCertificatePaging = Boolean.FALSE;
 
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -240,6 +240,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory();
         String transCompanyName = orderPagingSearchParam.getTransCompanyName();
         String driverName = orderPagingSearchParam.getDriverName();
+        LocalDateTime startPayTime = orderPagingSearchParam.getStartPayTime();
+        LocalDateTime endPayTime = orderPagingSearchParam.getEndPayTime();
         QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
                 .eq(stationId != null && stationId > 0, "a.station_id", stationId)
                 .like(StrUtil.isNotBlank(sn), "a.sn", sn)
@@ -254,7 +256,9 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .eq(null != transCompanyId, "a.trans_company_id", transCompanyId)
                 .eq("a.deleted", 0)
                 .eq(StrUtil.isNotBlank(area), "b.area", area)
-                .eq(null != goodsId, "c.origin_goods_id", goodsId);
+                .eq(null != goodsId, "c.origin_goods_id", goodsId)
+                .ge(startPayTime != null, "a.pay_time", startPayTime)
+                .le(endPayTime != null, "a.pay_time", endPayTime);
         OrderViewType type = orderPagingSearchParam.getType();
         Assert.notNull(type, () -> Exceptions.clierr("订单类型不能为空"));
         switch (type) {

njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/controller/PaymentController.java

@@ -201,7 +201,7 @@ public class PaymentController {
     /**
      * 微信支付回调接口
      */
-    @PostMapping("/wechat/notify")
+    @PostMapping(value = "/wechat/notify", produces = "text/xml;charset=utf-8")
     public String wechatPayNotify(@RequestBody String xmlData) {
         try {
             log.info("收到微信支付回调：{}", xmlData);
@@ -230,7 +230,9 @@ public class PaymentController {
             } else {
                 log.warn("无法从商户订单号中提取订单");
             }
-            return WxPayNotifyResponse.success("处理成功!");
+            String responseXml = WxPayNotifyResponse.success("OK");
+            log.info("准备返回给微信的支付回调XML响应: {}", responseXml);
+            return responseXml;
         } catch (WxPayException e) {
             log.error(e.getMessage());
             return WxPayNotifyResponse.fail(e.getMessage());
@@ -291,7 +293,7 @@ public class PaymentController {
     /**
      * 微信退款回调
      */
-    @PostMapping("/wechat/refundNotify")
+    @PostMapping(value = "/wechat/refundNotify", produces = "text/xml;charset=utf-8")
     public String parseRefundNotifyResult(@RequestBody String xmlData) {
         try {
             log.info("收到微信退款回调：{}", xmlData);
@@ -312,7 +314,9 @@ public class PaymentController {
                     .set(OrderInfoEntity::getRefundTime, LocalDateTime.now())
                     .update();
             log.info("退款回调处理成功，订单号：{}", orderSn);
-            return WxPayNotifyResponse.success("退款成功!");
+            String responseXml = WxPayNotifyResponse.success("OK");
+            log.info("准备返回给微信的退款回调XML响应: {}", responseXml);
+            return responseXml;
         } catch (WxPayException e) {
             log.error("退款回调处理异常：{}", e.getMessage(), e);
             return WxPayNotifyResponse.fail(e.getMessage());