修改参数

service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TestController.java

@@ -1,8 +1,6 @@
 package com.hchbox.controller;
 
-import cn.hutool.system.UserInfo;
 import com.google.gson.Gson;
-import com.hchbox.annotaion.UserId;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,9 +35,6 @@ public class TestController {
         return request.getParameter("TAO_MI_TOKEN");
     }
 
-    @GetMapping("/info")
-    public void getUserInfo(@UserId UserInfo userInfo) {
-        System.out.println(userInfo.toString());
-    }
+
 
 }

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/entity/slaver/User.java

@@ -3,10 +3,8 @@ package com.hchbox.entity.slaver;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;
-import org.springframework.data.annotation.CreatedDate;
 
 import javax.persistence.*;
-import java.sql.Timestamp;
 import java.util.Date;
 
 /**

service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java

@@ -3,21 +3,19 @@ package com.hchbox.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.hchbox.model.param.CommonResult;
 import com.hchbox.dto.SellerAccountDTO;
 import com.hchbox.entity.master.AppSetting;
 import com.hchbox.enums.ResponseCode;
+import com.hchbox.model.param.CommonResult;
+import com.hchbox.model.vo.AppConfigVo;
 import com.hchbox.repository.master.AppSettingRepository;
 import com.hchbox.service.AppSettingService;
-import com.hchbox.model.vo.AppConfigVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @author Enzo
  * @date : 2021/7/2
@@ -31,12 +29,12 @@ public class AppSettingServiceImpl implements AppSettingService {
 
     @Override
     public CommonResult<String> createAppSetting(SellerAccountDTO account, AppConfigVo vo) {
+        log.info("==============32 the create vo as {} ==============", JSONUtil.toJsonStr(vo));
         if (vo.getTemplateId() == null) {
-            return new CommonResult<String>().forbidden(ResponseCode.PAYMENT_FAILED.getDesc());
+            return new CommonResult<String>().forbidden(ResponseCode.PARAMETER_ERROR.getDesc());
         }
         // 开启设置
         AppSetting setting = new AppSetting();
-        setting.setType(vo.getSettingType());
         setting.setUserId(account.getId());
         setting.setSellerNick(account.getNickname());
         return getStringCommonResult(vo, setting);
@@ -49,6 +47,8 @@ public class AppSettingServiceImpl implements AppSettingService {
         }
         // 修改方法
         AppSetting appSetting = new AppSetting();
+        appSetting.setUserId(account.getId());
+        appSetting.setSellerNick(account.getNickname());
         return getStringCommonResult(vo, appSetting);
     }
 
@@ -61,7 +61,13 @@ public class AppSettingServiceImpl implements AppSettingService {
      * @return
      */
     private CommonResult<String> getStringCommonResult(AppConfigVo vo, AppSetting appSetting) {
+        log.info("==============64 the create vo as {} ==============", JSONUtil.toJsonStr(vo));
         BeanUtil.copyProperties(vo, appSetting);
+        appSetting.setType(vo.getSettingType());
+        appSetting.setIsDayOneRemind(vo.getDayOneRemind());
+        appSetting.setIsSendByOutSid(vo.getSendByOutSid());
+        appSetting.setIsDeliveryRemind(vo.getDeliverRemind());
+        appSetting.setIsDistribution(vo.getEnableDistribution());
         appSetting.setNotSendMerchandise(Joiner.on(StrUtil.COMMA).skipNulls().join(vo.getNotSendProduct()));
         appSetting.setSendMerchandise(Joiner.on(StrUtil.COMMA).skipNulls().join(vo.getSendProduct()));
         appSetting.setNotSendFlagStr(Joiner.on(StrUtil.COMMA).skipNulls().join(vo.getNotSendFlag()));

trade-common/src/main/java/com/hchbox/model/entity/BaseAppSetting.java

@@ -35,7 +35,7 @@ public class BaseAppSetting implements Serializable {
     private Long templateId;
 
 
-    @CreationTimestamp
+    @CreatedDate
     @Column(name = "create_time")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

trade-common/src/main/java/com/hchbox/model/param/CommonResult.java

@@ -64,9 +64,12 @@ public class CommonResult<T> implements Serializable {
 
     /**
      * 操作成功返回
+     *
+     * @update Enzo
+     * 前端商量data返还null
      */
     public static <T> CommonResult<T> successfulOperation() {
-        return new CommonResult<T>().success("操作成功");
+        return new CommonResult<T>().success(null);
     }
 
 
@@ -131,13 +134,12 @@ public class CommonResult<T> implements Serializable {
 
     /**
      * 未授权时使用
-     *
      * @param message 错误信息
      */
     public CommonResult<T> forbidden(String message) {
         this.data.put("message", message);
         this.data.put("code", FORBIDDEN);
-        this.data.put("data", message);
+        this.data.put("data", null);
         return this;
     }
 

trade-common/src/main/java/com/hchbox/model/vo/AppConfigVo.java

@@ -4,6 +4,7 @@ package com.hchbox.model.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.util.Date;
 import java.util.List;
 
@@ -79,7 +80,6 @@ public class AppConfigVo {
     private Double paymentCeiling;
 
 
-
     @ApiModelProperty("不发送无运单号的订单")
     private Boolean noSidNotSend;
 
@@ -116,6 +116,12 @@ public class AppConfigVo {
     @ApiModelProperty("发送账号id")
     private Long sendAccountId;
 
+    @ApiModelProperty(value = "发送开始时间小时")
+    private Integer sendHourStart;
+
+    @ApiModelProperty(value = "发送结束时间小时")
+    private Integer sendHourEnd;
+
 
 
 }