续期订单操作日志记录

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/RenewalUserQDTO.java

@@ -20,6 +20,18 @@ public class RenewalUserQDTO extends BasePageInfo implements Serializable {
      * wx企业Id
      */
     private String wxEnterpriseId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
 
     public String getSearchParam() {
         return searchParam;

haoban-manage3-service/src/main/resources/mapper/TabHaobanRenewalUserDao.xml

@@ -210,14 +210,10 @@
         select
         renewal_id, wx_enterprise_id, wx_user_id, order_id, phone, name, postion, invalid_flag, invalid_code, invalid_msg, update_time, create_time, delete_flag
         from tab_haoban_renewal_user
-        <where>
+        where wx_enterprise_id = #{wxEnterpriseId} and order_id = #{orderId} and delete_flag = 0 and invalid_flag = 1
             <if test="searchParam != null">
                 and (phone like CONCAT('%',#{searchParam},'%') or name like CONCAT('%',#{searchParam},'%'))
             </if>
-            <if test="wxEnterpriseId != null">
-                and wx_enterprise_id = #{wxEnterpriseId}
-            </if>
-        </where>
     </select>
 
 </mapper>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/LicenceOrderController.java

@@ -48,6 +48,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -104,7 +105,7 @@ public class LicenceOrderController {
      * 新增订单
      *
      * @param licenceOrderQO
-     * @return JSONObject key：orderId 和 price
+     * @return JSONObject key：orderId 和 price 和 invalidUserList
      */
     @RequestMapping("licence-order-saveOrUpdate")
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_LICENCE_ORDER,
@@ -123,12 +124,22 @@ public class LicenceOrderController {
         if (response.isSuccess()) {
             JSONObject object = JSONObject.parseObject(response.getResult(), JSONObject.class);
             String time = "";
+            String logValue = null ;
             if (licenceOrderQO.getTimeType() == 1) {
                 time = licenceOrderQO.getTimeValue() + "个月";
-            } else {
+            } else if (licenceOrderQO.getTimeType() == 2){
                 time = licenceOrderQO.getTimeValue() + "天";
+            }else {
+                //将秒级时间戳转换位Date类型
+                SimpleDateFormat formatter = new SimpleDateFormat(DateUtil.FORMAT_DATE_10);
+                String date_time = formatter.format(new Date(Long.valueOf(licenceOrderQO.getTimeValue()) * 1000L));
+                time = "指定到期时间"+date_time + " 23:59:59";
+            }
+            if (licenceOrderQO.getOrderType() == 1){
+                logValue = "【购买企微许可账号】：订单编号ZH" + object.getString("orderId") + ",企业员工账号" + licenceOrderQO.getExternalContactCount() + "个，时长" + time;
+            }else if (licenceOrderQO.getOrderType() == 2){
+                logValue = "【续期企微许可账号】：订单编号ZH" + object.getString("orderId") + ",企业员工账号" + licenceOrderQO.getStaffIdList().size() + "个，时长" + time;
             }
-            String logValue = "【购买企微许可账号】：订单编号ZH" + object.getString("orderId") + ",企业员工账号" + licenceOrderQO.getExternalContactCount() + "个，时长" + time;
             GicLogRecordEvaluationContext.putAttribute("logValue", logValue);
             return RestResponse.successResult(object);
         }
@@ -182,7 +193,12 @@ public class LicenceOrderController {
         if (response.isSuccess()) {
             Boolean result = licenceOrderApiService.updateLicenceOrderType(orderId, type, enterpriseId, wxEnterpriseId, clerkName, 1).getResult();
             //操作日志记录
-            String logValue = "【取消购买企微许可账号订单】：订单编号" + dto.getOrderNumber() + "，取消时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
+            String logValue = null;
+            if (dto.getOrderType() == 1 ){
+                logValue = "【取消购买企微许可账号订单】：订单编号" + dto.getOrderNumber() + "，取消时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
+            }else {
+                logValue = "【取消续期企微许可账号订单】：订单编号" + dto.getOrderNumber() + "，取消时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
+            }
             GicLogRecordEvaluationContext.putAttribute("logValue", logValue);
             return RestResponse.successResult(result);
         }
@@ -212,7 +228,12 @@ public class LicenceOrderController {
         String clerkName = loginUser.getClerkName();
         ServiceResponse<Boolean> response = licenceOrderApiService.uploadLicenceOrderVoucher(orderId, voucher, enterpriseId, wxEnterpriseId, clerkName);
         if (response.isSuccess()) {
-            String logValue = "【上传购买企微许可账号支付凭证】：订单编号" + dto.getOrderNumber() + "，上传时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
+            String logValue = null;
+            if (dto.getOrderType() ==1){
+                logValue = "【上传购买企微许可账号支付凭证】：订单编号" + dto.getOrderNumber() + "，上传时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
+            }else {
+                logValue = "【上传续期企微许可账号支付凭证】：订单编号" + dto.getOrderNumber() + "，上传时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
+            }
             GicLogRecordEvaluationContext.putAttribute("logValue", logValue);
             return RestResponse.successResult(true);
         }
@@ -379,7 +400,7 @@ public class LicenceOrderController {
         return RestResponse.successResult(response.getResult());
     }
     /**
-     * 分页查询订单列表
+     * 分页查询续期成员列表
      */
     @RequestMapping("renewal-user-page")
     public RestResponse<Page<RenewalUserVO>> getRenewalUserPage(@RequestBody RenewalUserQO renewalUserQO) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/licence/RenewalUserQO.java

@@ -19,4 +19,8 @@ public class RenewalUserQO extends BasePageInfo implements Serializable {
      * 员工姓名或手机号查询
      */
     private String searchParam;
+    /**
+     * 订单id
+     */
+    private Long orderId;
 }