Merge remote-tracking branch 'origin/dev' into dev

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/OrderInfoServiceImpl.java

@@ -523,18 +523,33 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     public int collectMoneyDeal(OfflineOrderPayVoucherForm payVoucher) {
         //更新订单状态
         String payNo = UUIDUtils.randomUUID();
-        GoodsOrderInfo order = new GoodsOrderInfo();
+        GoodsOrderInfo order = goodsOrderInfoMapper.selectByPrimaryKey(payVoucher.getOrderId());
         order.setGuid(payVoucher.getOrderId());
         order.setPayNo(payNo);
         order.setOrderAmount(payVoucher.getPayAmount());
         order.setOrderStatus(2);
         order.setModifiedTime(new Date());
-        order.setModifiedUser(SecurityUtils.getUserId()==null?"1":SecurityUtils.getUserId().toString());
+        order.setModifiedUser(SecurityUtils.getUserId().toString());
         goodsOrderInfoMapper.updateByPrimaryKeySelective(order);
         //保存收款凭证
         int result = orderPayVoucherService.newSavePayVoucher(payVoucher);
         //保存证书
         applicationContext.publishEvent(new CredentialInfoEvent(new Object(),payVoucher.getOrderId()));
+        //保存支付订单
+        GoodsPayOrderForm form = new GoodsPayOrderForm();
+        form.setFkCustomerId(payVoucher.getCustomerId());
+        form.setFkOrderId(payVoucher.getOrderId());
+        form.setPayAmount(payVoucher.getPayAmount());
+        form.setPayChannel(4);
+        form.setPayStatus(2);
+        form.setPayTime(new Date());
+        form.setCreateTime(new Date());
+        form.setModifiedTime(new Date());
+        form.setState(1);
+        form.setPayNo(order.getPayNo());
+        form.setOrderNo(order.getOrderNo());
+        orderPayService.saveSelective(form);
+
         return result;
     }