订单

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/fee/HaobanQywxFeeApiServiceImpl.java

@@ -15,17 +15,21 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.commons.util.UniqueIdUtils;
+import com.gic.dubbo.entity.ProviderLocalTag;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.constants.Manage3Constants;
+import com.gic.haoban.manage.api.dto.AlertMessageDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeAccountInterceptLogDTO;
 import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDTO;
 import com.gic.haoban.manage.api.dto.fee.HaobanQywxFeeDetailDTO;
 import com.gic.haoban.manage.api.dto.qdto.QywxFeeListQDTO;
+import com.gic.haoban.manage.api.enums.AlertTypeEnum;
 import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
@@ -247,14 +251,10 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             haobanQywxFeeService.insert(tabHaobanQywxFee);
             // 判断今天是否是本月最后一天
             if (DateUtil.isSameDay(DateUtil.endOfMonth(new Date()), new Date())) {
-                // int monthWillInterceptNum =
-                // haobanQywxFeeAccountStaffService.monthWillInterceptNum(wxEnterpriseId);
-                // String content = "30天将有" + monthWillInterceptNum +
-                // "个接口许可证即将过期，您总共还剩余" + permissionUserNum +
-                // "个可用的接口许可证，请保证数量充足，如需增加请及时联系相关人员续费，避免影响使用";
-                // 告警
-                // messageAlert(wxEnterpriseId, corpName, corpid,
-                // AlertTypeEnum.FEE_ALARM.getName(), content);
+                int monthWillInterceptNum = 0 ;// haobanQywxFeeAccountStaffService.monthWillInterceptNum(wxEnterpriseId);
+                String content = "30天将有" + monthWillInterceptNum + "个接口许可证即将过期，您总共还剩余" + permissionUserNum
+                        + "个可用的接口许可证，请保证数量充足，如需增加请及时联系相关人员续费，避免影响使用";
+                messageAlert(wxEnterpriseId, corpName, corpid, AlertTypeEnum.FEE_ALARM.getName(), content);
             }
         }
 
@@ -359,4 +359,25 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
         return EntityUtil.changeEntityNew(HaobanQywxFeeDTO.class,
                 haobanQywxFeeService.queryByWxEnterpriseId(wxEnterpriseId));
     }
+
+    private void messageAlert(String wxEnterpriseId, String corpName, String corpid, String titleSub, String content) {
+        ProviderLocalTag providerLocalTag = ProviderLocalTag.tag.get();
+        String traceId = providerLocalTag.traceId;
+        AlertMessageDTO messageDTO = new AlertMessageDTO();
+        messageDTO.setAlertTitle(titleSub);
+        messageDTO.setAlertType(AlertTypeEnum.FEE_ALARM.getType());
+        messageDTO.setWxEnterpriseId(wxEnterpriseId);
+        Map<String, Object> map = new HashMap<>();
+        map.put("企业名称", corpName);
+        map.put("企业id", corpid);
+        map.put("内容", content);
+        messageDTO.setContentMap(map);
+        messageDTO.setTraceId(traceId);
+        GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
+        try {
+            clientInstance.sendMessage("haobanAlertMq", JSONObject.toJSONString(messageDTO), 6 * 3600);
+        } catch (Exception e) {
+            logger.info("异常：{}", e.getMessage(), e);
+        }
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderRefundController.java

@@ -63,7 +63,7 @@ public class GicOrderRefundController {
         return RestResponse.successResult(resp.getResult());
     }
 
-    // 详情
+    // 退款-详情
     @RequestMapping(value = "order-refund-detail")
     @ResponseBody
     public RestResponse<Object> refundDetail(String orderRefundId) {
@@ -72,7 +72,7 @@ public class GicOrderRefundController {
         return RestResponse.successResult(vo);
     }
 
-    // 详情
+    // 换货-详情
     @RequestMapping(value = "order-exchange-detail")
     @ResponseBody
     public RestResponse<Object> exchangeDetail(String orderExchangeId) {
@@ -87,13 +87,12 @@ public class GicOrderRefundController {
     // step 1 申请 2收货
     @RequestMapping(value = "audit-refund-order")
     @ResponseBody
-    public RestResponse<Object> auditRefund(String enterpriseId, String orderRefundId, String memberId,
+    public RestResponse<Object> auditRefund(String enterpriseId, String memberId,
             @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark,
             @RequestParam(defaultValue = "1") int step, RefundBaseQDTO baseQDTO, double applyRefundPrice) {
         // 拒绝
         if (auditStatus == 1) {
             RefundRefusedQDTO qdto = EntityUtil.changeEntityNew(RefundRefusedQDTO.class, baseQDTO);
-            qdto.setOrderRefundId(orderRefundId);
             if (step == 1) {
                 this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto);
             }
@@ -105,7 +104,6 @@ public class GicOrderRefundController {
         if (auditStatus == 2) {
             RefundSellerAgreeQDTO qdto = EntityUtil.changeEntityNew(RefundSellerAgreeQDTO.class, baseQDTO);
             qdto.setApplyRefundPrice(applyRefundPrice);
-            qdto.setOrderRefundId(orderRefundId);
             if (step == 1) {
                 this.afterSalesManageApiService.refundSellerConfirmApply(enterpriseId, memberId, qdto);
             }
@@ -122,13 +120,12 @@ public class GicOrderRefundController {
     // step 1 申请 2收货
     @RequestMapping(value = "audit-exchange-order")
     @ResponseBody
-    public RestResponse<Object> auditExchange(String enterpriseId, String orderExchangeId, String memberId,
+    public RestResponse<Object> auditExchange(String enterpriseId, String memberId,
             @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark, RefundBaseQDTO baseQDTO,
             ExchangeAddressQDTO address, @RequestParam(defaultValue = "1") int step) {
         // 拒绝
         if (auditStatus == 1) {
             ExchangeRefusedQDTO qdto = EntityUtil.changeEntityNew(ExchangeRefusedQDTO.class, baseQDTO);
-            qdto.setOrderExchangeId(orderExchangeId);
             if (step == 1) {
                 this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto);
             }
@@ -154,8 +151,7 @@ public class GicOrderRefundController {
     // 换货单发货
     @RequestMapping(value = "exchange-order-deliver")
     @ResponseBody
-    public RestResponse<Object> exchangeDeliver(String enterpriseId, String orderRefundId,
-            @RequestParam(defaultValue = "1") int auditStatus, String clerkId, String remark) {
+    public RestResponse<Object> exchangeDeliver(String enterpriseId, String orderExchaneId) {
         return RestResponse.successResult();
     }