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

This commit is contained in:
Tankaikai
2024-11-13 17:09:01 +08:00

View File

@@ -1557,8 +1557,8 @@ public class PayService {
record.setName("商品券"); record.setName("商品券");
record.setType(2); record.setType(2);
record.setProId(actPro.getProductId()); record.setProId(actPro.getProductId());
record.setNum(actPro.getNum() * tbShopCoupon.getNumber()); record.setNum(actPro.getNum() * activate.getNum());
record.setOverNum(actPro.getNum() * tbShopCoupon.getNumber()); record.setOverNum(actPro.getNum() * activate.getNum());
record.setShopId(Integer.valueOf(tbShopUser.getShopId())); record.setShopId(Integer.valueOf(tbShopUser.getShopId()));
record.setSourceActId(activate.getId()); record.setSourceActId(activate.getId());
record.setSourceFlowId(flowId); record.setSourceFlowId(flowId);