商品字段bug

sp-admin/sa-view/tb-business/tb-car-disincle-info.html

@@ -42,6 +42,7 @@
                                         <sa-info name="业务项目" br>{{m.goodsName}}</sa-info>
                                         <sa-info name="作业时间" br>{{m.operateTime}}</sa-info>
                                         <sa-info name="业务费用" br>{{m.itemPrice}}（元）</sa-info>
+										<sa-info name="支付时间" br>{{m.payTime}}</sa-info>
                                     </el-col>
                                     <el-col span="12">
                                         <sa-info name="货主" br>{{m.owner}}</sa-info>

sp-server/src/main/java/com/pj/api/jh/service/JhService.java

@@ -164,7 +164,7 @@ public class JhService {
             return;
         }
         NotifyBO notifyBO = new NotifyBO();
-        notifyBO.setOutTradeNo(bo.getOutTradeNo())
+        notifyBO.setOutTradeNo(bo.getOutTradeNo()).setTimeEnd(bo.getSuccessTime())
                 .setTransactionId(bo.getBankTrxNo()).setTimeEnd(bo.getSuccessTime())
                 .setTotalFee(NumberUtil.mul(bo.getOrderPrice(), 100 + "").toString());
         wxService.WxNotify(notifyBO);

sp-server/src/main/java/com/pj/api/jh/task/CheckPayStatusTask.java

@@ -17,6 +17,7 @@ import com.pj.project4sp.global.BusinessException;
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.Map;
 
@@ -63,7 +64,12 @@ public class CheckPayStatusTask extends Task {
             if (StrUtil.equals("WAITING_PAYMENT", tbOrder.getOrderStatus())) {
                 JhService jhService = SpringUtil.getBean(JhService.class);
                 JhNotifyBO notifyBO = new JhNotifyBO();
-                notifyBO.setAttach(tbOrder.getAttach()).setBankTrxNo(tbOrder.getTransactionId()).setTradeStatus(orderStatus)
+                String completeDate=result.getStr("completeDate");
+                if (StrUtil.isEmpty(completeDate)){
+                    completeDate=LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+                }
+                notifyBO.setAttach(tbOrder.getAttach()).setBankTrxNo(tbOrder.getTransactionId())
+                        .setTradeStatus(orderStatus).setSuccessTime(completeDate)
                         .setOutTradeNo(tbOrder.getOutTradeNo()).setOrderPrice(tbOrder.getPrice());
                 jhService.notifyResult(notifyBO);
             }

sp-server/src/main/java/com/pj/api/wx/service/WxService.java

@@ -224,6 +224,11 @@ public class WxService {
         String attachStr = tbOrder.getAttach();
         String transactionId = notifyBO.getTransactionId();
         Date now = new Date();
+        String timeEnd=notifyBO.getTimeEnd();
+        Date payTime=now;
+        if (StrUtil.isNotEmpty(timeEnd)){
+            payTime=DateUtil.parse(timeEnd,"yyyyMMddHHmmss");
+        }
         if (StrUtil.isNotEmpty(attachStr)) {
             Attach attach = JSONUtil.toBean(attachStr, Attach.class);
             List<PriceBO> cars = JSONUtil.toList(attach.getC(), PriceBO.class);
@@ -235,7 +240,7 @@ public class WxService {
                     log.error("付款金额不正确:{}", JSONUtil.toJsonStr(notifyBO));
                     continue;
                 }
-                car.setPay(1).setMoney(car.getMoney().add(price)).setPayTime(now).setPayType(TbBusinessCar.PayTypeEnum.HAS_PAY_TYPE.getType());
+                car.setPay(1).setMoney(car.getMoney().add(price)).setPayTime(payTime).setPayType(TbBusinessCar.PayTypeEnum.HAS_PAY_TYPE.getType());
                 tbBusinessCarService.updateById(car);
                 TbBusiness business = tbBusinessService.getById(car.getBusinessId());
                 if (business != null) {
@@ -246,12 +251,13 @@ public class WxService {
             }
             tbFeeDetailsService.chargeParkFee(cars, transactionId, outTradeNo);//添加cars的收费明细
             String businessId = attach.getB();
+            Date finalPayTime = payTime;
             if (StrUtil.isNotEmpty(businessId)) {
                 List<String> businessIds = StrUtil.splitTrim(businessId, ",");
                 List<TbBusinessItem> items = tbBusinessItemService.findByBusinessIdList(businessIds);
                 List<TbBusiness> businessList = tbBusinessService.listByIds(businessIds);
                 for (TbBusiness tbBusiness : businessList) {
-                    tbBusiness.setPayTime(now).setPayType(3).setConfirmInput(1).setConfirmInputTime(now)
+                    tbBusiness.setPayTime(payTime).setPayType(3).setConfirmInput(1).setConfirmInputTime(payTime)
                             .setPayMoney(tbBusiness.getPayMoney().add(tbBusiness.getItemPrice()))
                             .setPayNo(transactionId);
                     tbBusiness.setPayStatus(tbBusiness.getPayMoney().equals(tbBusiness.getItemPrice()) ? 3 : 4);
@@ -263,13 +269,13 @@ public class WxService {
                         //
                         if (TbItem.ItemTypeEnum.EMPTY_TYPE.getType().equals(carType) && tbGoods.getChinaCarPay() == 0
                                 || TbItem.ItemTypeEnum.WEIGHT_TYPE.getType().equals(carType) && tbGoods.getVietnamCarPay() == 0) {
-                            tbBusinessCar.setPay(1).setPayTime(now);
+                            tbBusinessCar.setPay(1).setPayTime(finalPayTime);
                             tbBusinessCarService.updateById(tbBusinessCar);
                         }
                     });
                 }
                 tbFeeStatisticsService.countBusinessFee(items, transactionId, outTradeNo);//业务费统计
-                items.forEach(tbBusinessItem -> tbBusinessItem.setPayStatus(1).setPayTime(now));
+                items.forEach(tbBusinessItem -> tbBusinessItem.setPayStatus(1).setPayTime(finalPayTime));
                 tbBusinessItemService.updateBatchById(items);
             }
             String a = attach.getA();