修改 订单添加金币相关代码

src/main/java/org/rcisoft/app/appOrder/controller/AppOrderController.java

@@ -87,4 +87,15 @@ public class AppOrderController extends CyPaginationController<CmsOrder> {
     }
 
 
+    @PreAuthorize("@cyPerm.hasPerm('app:order:add')")
+    @CyOpeLogAnno(title = "system-订单信息表管理-充值金币", businessType = CyLogTypeEnum.INSERT)
+    @Operation(summary="充值金币", description="充值金币")
+    @PostMapping(value = "/order/addGold")
+    public CyResult addGold(@Valid @RequestBody CmsOrder cmsOrder, BindingResult bindingResult) {
+        CyPersistModel data = cmsOrderServiceImpl.addGold(cmsOrder);
+        return CyResultGenUtil.builder(data,
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                cmsOrder);
+    }
 }

src/main/java/org/rcisoft/app/pay/controller/WxPayController.java

@@ -42,7 +42,7 @@ public class WxPayController {
      */
     @PostMapping("/pay")
     public Map<String, Object> pay(HttpServletRequest request,@RequestBody OrderActivityDto orderActivityDto) throws IOException, JDOMException {
-        return wxPayService.wxPay(orderActivityDto.getOrderId(), orderActivityDto.getActivityId(), request);
+        return wxPayService.wxPay(orderActivityDto.getOrderId(), orderActivityDto.getActivityId(), orderActivityDto.getType(), request);
     }
 
     /**
@@ -52,7 +52,7 @@ public class WxPayController {
      */
     @PostMapping("/updateOrderStatus")
     public CyResult updateOrderStatus(@RequestBody OrderActivityDto orderActivityDto) {
-        CyPersistModel data = wxPayService.updateOrderStatus(orderActivityDto.getOrderId(), orderActivityDto.getActivityId());
+        CyPersistModel data = wxPayService.updateOrderStatus(orderActivityDto.getOrderId(), orderActivityDto.getActivityId(), orderActivityDto.getType());
         return CyResultGenUtil.builder(data,
                 CyMessCons.MESSAGE_ALERT_SUCCESS,
                 CyMessCons.MESSAGE_ALERT_ERROR,

src/main/java/org/rcisoft/app/pay/service/WxPayService.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 public interface WxPayService {
 
 
-    JSONObject wxPay(Long orderId, Long activityId, HttpServletRequest request) throws IOException, JDOMException;
+    JSONObject wxPay(Long orderId, Long activityId, Integer type, HttpServletRequest request) throws IOException, JDOMException;
 
     void wxNotify(HttpServletRequest request, HttpServletResponse response)  throws IOException, JDOMException;
 
@@ -27,12 +27,13 @@ public interface WxPayService {
 
     /**
      * 小程序调用wx.requestPayment(OBJECT)发起微信支付成功后更新订单状态
+     * @param request
      * @param orderId
      * @param activityId
-     * @param request
+     * @param type
      * @return
      */
-    CyPersistModel updateOrderStatus(Long orderId, Long activityId);
+    CyPersistModel updateOrderStatus(Long orderId, Long activityId, Integer type);
 
     //主动查询微信订单状态
     String selectWxOrderStatus(String orderNo) throws IOException, JDOMException;

src/main/java/org/rcisoft/business/cmsOrder/dto/OrderActivityDto.java

@@ -12,4 +12,7 @@ public class OrderActivityDto {
     /** 活动id */
     private Long activityId;
 
+    /** 订单类型 0活动 1金币 */
+    private Integer type;
+
 }

src/main/java/org/rcisoft/business/cmsOrder/entity/CmsOrder.java

@@ -209,5 +209,9 @@ public class CmsOrder  extends CyIdSnowflakeEntity<CmsOrder> {
      @Transient
      @TableField(exist = false)
      private String applicationStatus;
+
+     //现在的余额
+     @TableField(exist = false)
+     private Integer balance;
 }
 

src/main/java/org/rcisoft/business/cmsOrder/service/CmsOrderService.java

@@ -128,4 +128,11 @@ public interface CmsOrderService {
      * @return
      */
     int manualCompensateOrder(CmsOrder dto);
+
+    /**
+     * 充值金币
+     * @param cmsOrder
+     * @return
+     */
+    CyPersistModel addGold(CmsOrder cmsOrder);
 }

src/main/java/org/rcisoft/core/async/AsyncFactory.java

@@ -165,7 +165,10 @@ public class AsyncFactory
                         }
                         orderInfo.setApplicationStatus("1");
                         //redis  key: 【order:activity:${aid}:${oid}】 value 【hash】；ttl：-1；hash state-> 【未同步】，status -> 退款中 (2 3)
-                        CySpringBeanComp.getBean(CyRedisServiceImpl.class).set(RedisCons.ORDER_ACTIVITY +":"+ orderInfo.getGoodsId() + ":" + orderInfo.getBusinessId(),orderInfo);
+                        if (orderInfo.getType().equals(0))
+                            CySpringBeanComp.getBean(CyRedisServiceImpl.class).set(RedisCons.ORDER_ACTIVITY +":"+ orderInfo.getGoodsId() + ":" + orderInfo.getBusinessId(),orderInfo);
+                        else if (orderInfo.getType().equals(1))
+                            CySpringBeanComp.getBean(CyRedisServiceImpl.class).set(RedisCons.ORDER_GOLD +":"+ orderInfo.getGoodsId() + ":" + orderInfo.getBusinessId(),orderInfo);
                         //发送 mq，exchange：`order_activity`    route-key：`order_activity_status`   value 【订单】
 //                        CySpringBeanComp.getBean(RabbitClusterUtil.class).sendMsg(orderInfo,
 //                                CySpringBeanComp.getBean(RabbitMQConfigBean.class).ORDER_EXCHANGE_NAME,

src/main/java/org/rcisoft/core/util/RedisCons.java

@@ -24,6 +24,8 @@ public class RedisCons {
 
     //订单活动信息
     public static final String ORDER_ACTIVITY = "order:activity";
+    //订单金币信息
+    public static final String ORDER_GOLD = "order:gold";
     //订单数据库锁
     public static final String ORDER_DB = "order:db:";
     //订单redis锁