Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/LicenceOrderQDTO.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/impl/LicenceOrderServiceImpl.java
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/LicenceOrderController.java

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/LicenceOrderApiServiceImpl.java

@@ -124,8 +124,45 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
 
     @Override
     public ServiceResponse<String> saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO) {
-        String s = licenceOrderService.saveOrUpdateLicenceOrder(licenceOrderQDTO);
-        return ServiceResponse.success(s);
+        //创建企业微信订单，查询企业微信订单详情，返回订单金额
+        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(licenceOrderQDTO.getWxEnterpriseId());
+        if (wxEnterpriseDTO == null) {
+            return ServiceResponse.failure("-9999", "企业微信不存在！！");
+        }
+        String openCorpid = wxEnterpriseDTO.getOpenCorpid();
+        String serviceCorpid = config.getCorpid();
+        CreateOrderQDTO orderQDTO = new CreateOrderQDTO();
+        orderQDTO.setBaseCount(0);
+        orderQDTO.setExternalCount(licenceOrderQDTO.getExternalContactCount());
+        orderQDTO.setBuyerUserid(config.getBuyerUserid());
+        if (licenceOrderQDTO.getTimeType() == 1) {
+            orderQDTO.setMonths(licenceOrderQDTO.getTimeValue());
+            orderQDTO.setDays(0);
+        } else {
+            orderQDTO.setMonths(0);
+            orderQDTO.setDays(licenceOrderQDTO.getTimeValue());
+        }
+        ServiceResponse<CreateOrderResponseDTO> newOrder = qywxOrderApiService.createNewOrder(serviceCorpid, openCorpid, orderQDTO);
+        logger.info("企业微信订单返回信息：{}", JSON.toJSONString(newOrder));
+        if (newOrder.isSuccess()) {
+            //更新企业微信订单状态，保存企业微信订单id
+            String qywxOrderId = newOrder.getResult().getOrderId();
+            //查询订单详情，获取订单金额
+            FeeOrderDeatilResponseDTO dto = qywxUserApiService.getOrder(openCorpid, serviceCorpid, qywxOrderId);
+            logger.info("查询企业微信订单详情返回信息：{}", JSON.toJSONString(dto));
+            if (null != dto && 0 == dto.getErrcode()){
+                Integer price = dto.getOrder().getPrice();
+                licenceOrderQDTO.setQywxOrderId(qywxOrderId);
+                licenceOrderQDTO.setPrice(price);
+                String s = licenceOrderService.saveOrUpdateLicenceOrder(licenceOrderQDTO);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("orderId",s);
+                jsonObject.put("price",price);
+                return ServiceResponse.success(JSON.toJSONString(jsonObject));
+            }
+            return ServiceResponse.failure(String.valueOf(dto.getErrcode()), dto.getErrmsg());
+        }
+        return ServiceResponse.failure(newOrder.getCode(), newOrder.getMessage());
     }
 
     @Override