|
|
@@ -284,7 +284,7 @@ public class WxController extends BaseController {
|
|
|
WxOrder order = new WxOrder();
|
|
|
String orderCode = getOrderCode(userInfo.getId());
|
|
|
order.setGoodsId(birthdayLog.getId()); //八字记录ID
|
|
|
- order.setGoodsName("八字排盘");
|
|
|
+ order.setGoodsName("人生报告");
|
|
|
order.setGoodsType(3);
|
|
|
order.setOutTradeNo(orderCode);
|
|
|
order.setUserId(userInfo.getId());
|
|
|
@@ -301,7 +301,7 @@ public class WxController extends BaseController {
|
|
|
order.setProfitSharing(0); //待分账
|
|
|
order.setOrderStatus(OrderStatusEnum.PROCESSING.getCode());
|
|
|
wxOrderService.save(order);
|
|
|
- return Response.success(placeXcxWxOrder(order, "八字排盘"));
|
|
|
+ return Response.success(placeXcxWxOrder(order, "人生报告"));
|
|
|
} else {
|
|
|
throw new CustomException("请正确传入GoodsType。");
|
|
|
}
|
|
|
@@ -327,7 +327,7 @@ public class WxController extends BaseController {
|
|
|
.put("out_trade_no", order.getOutTradeNo());
|
|
|
rootNode.putObject("amount").put("total", order.getTotal());
|
|
|
rootNode.putObject("payer").put("openid", order.getXcxOpenid());
|
|
|
-// if("八字排盘".equals(goodsName)) {
|
|
|
+// if("人生报告".equals(goodsName)) {
|
|
|
// rootNode.putObject("settle_info").put("profit_sharing", true);
|
|
|
// }
|
|
|
objectMapper.writeValue(bos, rootNode);
|
