Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java

src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

@@ -340,7 +340,7 @@ public class PayService {
             req.setTimestamp(System.currentTimeMillis());
             req.setIp(ip);
             req.setMercOrderNo(orderInfo.getOrderNo());
-            req.setNotifyUrl(callBackGroupurl);
+            req.setNotifyUrl(callBackGroupurl+"Ysk");
             req.setPayAmt(payment.getAmount().setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
             if (payType.equals("wechatPay")) {
                 req.setPayType("03");
@@ -805,7 +805,7 @@ public class PayService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public String callBackGroupPay(String payOrderNO) {
+    public String callBackGroupPay(String payOrderNO,String payTime) {
         TbGroupOrderInfo orderInfo = tbGroupOrderInfoMapper.selectByPayOrderNo(payOrderNO);
         if (ObjectUtil.isEmpty(orderInfo)) {
             return "订单信息不存在";
@@ -823,6 +823,7 @@ public class PayService {
             //修改主单状态
             orderInfo.setStatus("unused");
             orderInfo.setPayAmount(orderInfo.getOrderAmount());
+            orderInfo.setPayTime(DateUtils.fomatDateTime(payTime));
             tbGroupOrderInfoMapper.update(orderInfo);
             return "SUCCESS";
         }else {