|
@@ -73,6 +73,8 @@ public class WxPayServiceImpl implements WxPayService {
|
|
|
if (goods == null) {
|
|
|
return null;
|
|
|
}
|
|
|
+ Long bookId = wxPayRequest.getBookId();
|
|
|
+
|
|
|
BigDecimal money = goods.getMoney();
|
|
|
String amount = String.valueOf(money.multiply(new BigDecimal(100)).intValue());
|
|
|
//todo 支付域名
|
|
@@ -121,6 +123,7 @@ public class WxPayServiceImpl implements WxPayService {
|
|
|
order.setRewardAdminId(0);
|
|
|
order.setGroup(new Byte((byte) 3));
|
|
|
order.setMark(0);
|
|
|
+ order.setBookId(bookId);
|
|
|
order.setChannelBenefit(adminExtend.getBenefit());
|
|
|
order.setChannelBenefitMoney(money.multiply(adminExtend.getBenefit()));
|
|
|
order.setMoneyBenefit(money.multiply(adminExtend.getBenefit()));
|
|
@@ -195,7 +198,7 @@ public class WxPayServiceImpl implements WxPayService {
|
|
|
ordersCollect.setFlag("1");
|
|
|
ordersCollect.setBusinessLine("1");
|
|
|
|
|
|
- ordersCollect.setCreatedate(DateUtils.getDateNow() + "");
|
|
|
+ ordersCollect.setCreatedate(TimeUtil.getCurrentDate(TimeUtil.YYYYMMDD1));
|
|
|
ordersCollect.setRechargeMoney(new BigDecimal(0.00));
|
|
|
ordersCollect.setRechargeMoneyBenefit(new BigDecimal(0.00));
|
|
|
ordersCollect.setNormalRechargeOrdersCount(1);
|
|
@@ -283,7 +286,7 @@ public class WxPayServiceImpl implements WxPayService {
|
|
|
ordersCollect.setAdminId(order.getAdminId());
|
|
|
ordersCollect.setType("1");
|
|
|
ordersCollect.setFlag("1");
|
|
|
- ordersCollect.setCreatedate(DateUtils.getDateNow() + "");
|
|
|
+ ordersCollect.setCreatedate(TimeUtil.getCurrentDate(TimeUtil.YYYYMMDD1));
|
|
|
ordersCollect.setRechargeMoney(order.getMoney());
|
|
|
ordersCollect.setRechargeMoneyBenefit(order.getMoney().multiply(adminExtend.getBenefit()));
|
|
|
/* ordersCollect.setNormalRechargeOrdersCount(0);
|