1.修改会员余额支付备注
This commit is contained in:
@@ -111,7 +111,7 @@ public class OrderController {
|
|||||||
String userId = jsonObject.getString("accountId");
|
String userId = jsonObject.getString("accountId");
|
||||||
orderVo.setMerchantId(Integer.valueOf(userId));
|
orderVo.setMerchantId(Integer.valueOf(userId));
|
||||||
orderVo.setUserId(jsonObject.getString("staffId"));
|
orderVo.setUserId(jsonObject.getString("staffId"));
|
||||||
return orderService.createOrder(orderVo,clientType,token, null, true);
|
return orderService.createOrder(orderVo,clientType,token, null, orderVo.getType() != null && orderVo.getType().equals(0));
|
||||||
}
|
}
|
||||||
@PostMapping("/createBackOrder")
|
@PostMapping("/createBackOrder")
|
||||||
public Result createBackOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
|
public Result createBackOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
|
||||||
|
|||||||
@@ -14,4 +14,5 @@ public class OrderVo {
|
|||||||
private Integer merchantId;
|
private Integer merchantId;
|
||||||
private String tableId;
|
private String tableId;
|
||||||
private Integer vipUserId;
|
private Integer vipUserId;
|
||||||
|
private Integer type;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -808,7 +808,7 @@ public class PayService {
|
|||||||
userFlow.setBalance(shopUser.getAmount());
|
userFlow.setBalance(shopUser.getAmount());
|
||||||
userFlow.setShopUserId(shopUser.getId());
|
userFlow.setShopUserId(shopUser.getId());
|
||||||
userFlow.setBizCode("vipCardCash");
|
userFlow.setBizCode("vipCardCash");
|
||||||
userFlow.setBizName("代客下单会员余额支付");
|
userFlow.setBizName("余额支付");
|
||||||
userFlow.setCreateTime(DateUtil.date());
|
userFlow.setCreateTime(DateUtil.date());
|
||||||
userFlow.setType("-");
|
userFlow.setType("-");
|
||||||
mpShopUserFlowMapper.insert(userFlow);
|
mpShopUserFlowMapper.insert(userFlow);
|
||||||
|
|||||||
Reference in New Issue
Block a user