日志

xpgx-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java

@@ -223,7 +223,7 @@ public class WxController extends BaseController {
     public Response<JSONObject> xcxPrepareOrder(@RequestBody WxOrderDTO wxOrderDTO) throws Exception {
         UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
         String profitSharing = configService.selectConfigByKey("profit_sharing");
-        if (wxOrderDTO.getGoodsType() == 1) {
+        if (wxOrderDTO.getGoodsType() == 3) {
             String baziPriceStr = configService.selectConfigByKey("bazi_price");
             BirthdayLog birthdayLog = birthdayLogService.getById(wxOrderDTO.getGoodsId()); //记录ID
             if(birthdayLog!=null && (birthdayLog.getIsPay()==1 || birthdayLog.getIsPay()==2)) {

xpgx-service/src/main/java/com/miaxis/birthday/domain/BirthdayLog.java

@@ -60,5 +60,5 @@ public class BirthdayLog extends BaseBusinessEntity{
     @Excel(name = "是否付费 0：未付费 1：基础版  2：高级版")
     @TableField("is_pay")
     @ApiModelProperty(value = "是否付费 0：未付费 1：基础版  2：高级版")
-    private Long isPay;
+    private Integer isPay;
 }

xpgx-service/src/main/java/com/miaxis/job/AppAdJob.java

@@ -7,6 +7,7 @@ import com.miaxis.system.service.ISysDictDataService;
 import com.miaxis.wx.service.IWxOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -64,7 +65,7 @@ public class AppAdJob {
     }
 
 
-    //@Scheduled(cron = "0 0/5 * * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
     public void wxProfitsharing()  {
         log.info("--------现在开始执行每1分钟一次的微信分帐！~---------------");
 

xpgx-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -1,6 +1,8 @@
 package com.miaxis.order.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.birthday.domain.BirthdayLog;
+import com.miaxis.birthday.service.IBirthdayLogService;
 import com.miaxis.common.utils.DateUtils;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.OrderInfoDto;
@@ -29,6 +31,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Autowired
     private OrderInfoMapper orderInfoMapper;
 
+    @Autowired
+    private IBirthdayLogService birthdayLogService;
+
     /**
      * 查询ad列表
      *
@@ -67,8 +72,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         orderInfo.setForeType(order.getForeType());
         orderInfo.setPhoneType(order.getPhoneType());
 
-        if(order.getGoodsType()==1) { //考场
-            //添加会员信息
+        if(order.getGoodsType()==3) { //人生报告
+            //添加八字信息
+            BirthdayLog birthdayLog = birthdayLogService.getById(order.getGoodsId());
+            birthdayLog.setIsPay(1);
+            birthdayLogService.saveOrUpdate(birthdayLog);
+            this.save(orderInfo);
         } else if(order.getGoodsType()==2) { //商品
             //添加会员信息
         }