Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: b58b48a4093ad6ad54c7e4ee73f600f707f67c20
+  newTag: 8556b74aa8ed48d880b5cbd7e803132aff549437

src/main/java/com/mmc/oms/model/vo/demand/CommonPaymentVO.java

@@ -24,7 +24,7 @@ public class CommonPaymentVO {
     @ApiModelProperty(value = "商品描述")
     private String description;
 
-    @ApiModelProperty(value = "订单来源 0：产品商城 1：租赁订单 2：培训订单 3发布需求 4服务需求发布 5充值 ...其他后续加")
+    @ApiModelProperty(value = "订单来源 0：产品商城 1：租赁订单 2：培训订单 3发布需求 4服务需求发布 5充值 6购买课程...其他后续加")
     private Integer orderPort;
 
     @ApiModelProperty(value = "金额：单位（分）")

src/main/java/com/mmc/oms/service/demand/Impl/DemandReleaseOrderServiceImpl.java

@@ -112,11 +112,37 @@ public class DemandReleaseOrderServiceImpl implements DemandReleaseOrderService
                 return publishServicePay(commonPaymentVO, token, userAccountId, request);
             case "5":
                 return topUpOrder(commonPaymentVO, token, userAccountId);
+            case "6":
+                return payCurriculumOrder(commonPaymentVO, token);
             default:
                 return ResultBody.error("无效的订单类型操作！");
         }
     }
 
+    private ResultBody payCurriculumOrder(CommonPaymentVO commonPaymentVO, String token) {
+        if ("6".equals(commonPaymentVO.getOrderPort().toString())) {
+            try {
+                TimeUnit.SECONDS.sleep(1);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            String orderNumber = commonPaymentVO.getOrderNumber();
+            String json = stringRedisTemplate.opsForValue().get(orderNumber);
+            GetOrderNumberDTO getOrderNumberDTO = JSONObject.parseObject(json, GetOrderNumberDTO.class);
+            GetOrderNumberDO getOrderNumberDO = new GetOrderNumberDO(getOrderNumberDTO);
+            releaseOrderDao.insertService(getOrderNumberDO);
+            BigDecimal paramMoney = getOrderNumberDO.getWeChatPay();
+            BigDecimal multiply = paramMoney.multiply(new BigDecimal(100));
+            int i = multiply.intValue();
+            OrderRequestParamsVO orderRequestParamsVO = getOrderNumberDO.orderRequestParamsVO();
+            orderRequestParamsVO.setAmount(i);
+            ResultBody resultBody = releaseOrder(orderRequestParamsVO, token);
+            stringRedisTemplate.opsForValue().set(getOrderNumberDO.getPaymentOrderNumber() + getOrderNumberDO.getUserAccountId(), JsonUtil.parseObjToJson(getOrderNumberDO));
+            return resultBody;
+        }
+        return ResultBody.success();
+    }
+
     private ResultBody payLeaseOrder(CommonPaymentVO commonPaymentVO, String token) {
         OrderRequestParamsVO orderRequestParamsVO = new OrderRequestParamsVO();
         orderRequestParamsVO.setOrderNo(commonPaymentVO.getOrderNumber());

src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ spring:
     password: ${MYSQL_PASSWORD}
   redis:
     database: 1
-    host: redis.default
+    host: 172.24.1.207
     port: 6379
     password: ${REDIS_PASSWORD}
     jedis:
@@ -15,7 +15,7 @@ spring:
         max-active: 2
   #rabbitMQ
   rabbitmq:
-    host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.vpc.mq.amqp.aliyuncs.com
+    host: 172.24.1.207
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: ${RABBITMQ_PASSWORD}

src/main/resources/application-local.yml

@@ -13,6 +13,13 @@ spring:
     jedis:
       pool:
         max-active: 2
+  #rabbitMQ
+  rabbitmq:
+    host: 8.139.4.51
+    port: 5672
+    username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
+    password: RTg3OUMxQzk4NzU0NDQ4RkQ1RDg4MkEzQjY4M0M3MkQxOTM2QkEyNDoxNjUyNDA4NDk0NDg4
+    virtual-host: dev
   main:
     allow-circular-references: true