|
@@ -210,7 +210,7 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
}
|
|
|
//可用=可用-本次抵扣
|
|
|
availableMoney = MathUtil.sub(availableMoney, balancePayFee).doubleValue();
|
|
|
- userMoney = MathUtil.sub(userMoney,balancePayFee).doubleValue();
|
|
|
+ userMoney = MathUtil.sub(userMoney, balancePayFee).doubleValue();
|
|
|
payOrderMapper.updateMoneyByUserId(userMoney, availableMoney, order.getUserId());
|
|
|
log.info("【订单支付,余额抵扣】>>>>>>>>>>>更新用户余额(update[user])userId:" + order.getUserId() + ",orderId:" + orderId);
|
|
|
//保存余额到余额收支记录
|
|
@@ -659,6 +659,12 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
public ResponseJson<Map<String, Object>> getCheckoutShopOrders(Integer shopOrderId) {
|
|
|
// 订单信息
|
|
|
ShopOrderVo shop = orderCommonMapper.getShopOrderByOrderId(shopOrderId);
|
|
|
+ String weChatFlag = "0";
|
|
|
+ if(StringUtils.isNotBlank(shop.getSplitCode())){
|
|
|
+ weChatFlag = orderCommonMapper.findWeChatFlag(shop.getSplitCode(),shop.getShopId());
|
|
|
+ }else{
|
|
|
+ weChatFlag = "2";
|
|
|
+ }
|
|
|
OrderVo order = orderCommonMapper.getOrderByOrderId(shop.getOrderId());
|
|
|
Integer onlinePay = order.getOnlinePayFlag();
|
|
|
if (null == shop || null == order) {
|
|
@@ -689,7 +695,7 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
shop.setReceiptAmount(receiptAmount.get());
|
|
|
shop.setEachDiscount(orderCommonMapper.findEachDiscount(shopOrderId));
|
|
|
shop.setObligation(MathUtil.sub(shop.getRealPay(), receiptAmount.get()).doubleValue());
|
|
|
- if(998==shop.getShopId()){
|
|
|
+ if (998 == shop.getShopId()) {
|
|
|
shop.setObligation(orderCommonMapper.findShopFee(shopOrderId));
|
|
|
}
|
|
|
// 总成本
|
|
@@ -740,6 +746,7 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
map.put("discernReceipt", discernReceiptList);
|
|
|
map.put("orderProductList", orderProductByShopOrderId);
|
|
|
map.put("onlinePay", onlinePay);
|
|
|
+ map.put("weChatFlag", weChatFlag);
|
|
|
return ResponseJson.success(map);
|
|
|
}
|
|
|
|