|
@@ -402,6 +402,32 @@ public class StoreOrderController extends AppBaseController {
|
|
|
throw new CustomException("支付失败" + e.getMessage());
|
|
throw new CustomException("支付失败" + e.getMessage());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ //判断0金额订单
|
|
|
|
|
+ }else if(order.getPayType().equals("1") && order.getPayMoney().compareTo(BigDecimal.ZERO) ==0 ){
|
|
|
|
|
+ FsStorePayment storePayment=new FsStorePayment();
|
|
|
|
|
+ storePayment.setCompanyId(order.getCompanyId());
|
|
|
|
|
+ storePayment.setCompanyUserId(order.getCompanyUserId());
|
|
|
|
|
+// storePayment.setPayMode(fsPayConfig.getType());
|
|
|
|
|
+ storePayment.setStatus(1);
|
|
|
|
|
+ storePayment.setPayCode(payCode);
|
|
|
|
|
+ storePayment.setPayMoney(order.getPayMoney());
|
|
|
|
|
+ storePayment.setCreateTime(new Date());
|
|
|
|
|
+ storePayment.setPayTypeCode("weixin");
|
|
|
|
|
+ storePayment.setBusinessType(2);
|
|
|
|
|
+ storePayment.setRemark("商城订单支付");
|
|
|
|
|
+ storePayment.setOpenId(user.getRealName());
|
|
|
|
|
+ storePayment.setUserId(user.getUserId());
|
|
|
|
|
+ storePayment.setBusinessOrderId(order.getId().toString());
|
|
|
|
|
+ storePayment.setOrderId(order.getId());
|
|
|
|
|
+ fsStorePaymentMapper.insertFsStorePayment(storePayment);
|
|
|
|
|
+
|
|
|
|
|
+ FsStoreOrder storeOrder = new FsStoreOrder();
|
|
|
|
|
+ storeOrder.setId(order.getId());
|
|
|
|
|
+ storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue());
|
|
|
|
|
+ storeOrder.setStatus(OrderInfoEnum.STATUS_1.getValue());
|
|
|
|
|
+ storeOrder.setPayTime(new Date());
|
|
|
|
|
+ orderService.updateFsStoreOrder(storeOrder);
|
|
|
|
|
+ return R.ok().put("payType",4);
|
|
|
}
|
|
}
|
|
|
// else if(order.getPayType().equals("3")){
|
|
// else if(order.getPayType().equals("3")){
|
|
|
else if(order.getPayType().equals("3") && order.getPayMoney().compareTo(new BigDecimal(0))<=0){
|
|
else if(order.getPayType().equals("3") && order.getPayMoney().compareTo(new BigDecimal(0))<=0){
|
