1、商场对接BUG处理 2、api去除configue

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/CommonService.java

@@ -4,7 +4,7 @@ import com.usoftchina.saas.auth.client.interceptor.ServiceFeignInterceptor;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-@FeignClient(name = "commons-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "commons-server")
 public interface CommonService {
 
     @PostMapping("/action/audit")

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/ConfigsApi.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
-@FeignClient(name = "commons-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "commons-server")
 public interface ConfigsApi {
 
     @GetMapping("/configs/list/{companyId}")

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @Author: guq
  * @Date: 2018/10/20
  */
-@FeignClient(name = "commons-server", fallback = MaxnumberServiceFallback.class, configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "commons-server", fallback = MaxnumberServiceFallback.class)
 public interface MaxnumberService {
     /**
      * @Description: 更新并获取最大编号

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MessageLogService.java

@@ -14,7 +14,7 @@ import org.springframework.web.context.request.async.DeferredResult;
 * @Author: guq
 * @Date: 2018/10/20
 */
-@FeignClient(name = "commons-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "commons-server")
 public interface MessageLogService {
 
     @RequestMapping("/messagelog/save")

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/SystemRemindApi.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "commons-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "commons-server")
 public interface SystemRemindApi {
 
     @PostMapping("/remind/apply/save")

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -104,6 +104,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     SALE_ORDER_CUSTBANDED(72011, "存在已禁用客户，无法%s,单据编号:"),
     SALE_CUSTBANDED(72013, "存在已禁用客户，无法%s"),
     SALE_AUDITED(72014,"审核失败！该单据已审核"),
+    SALE_EXISTS_SALEDOWN(72015, "此单已转销售订单，请勿重复转单"),
     //资金
     PAYBALANCE_OUTNOWBALANCE(74001,"本次核销金额不能大于未核销金额"),
     PAYBALANCE_UNIQUESOURCECODE(74002, "保存失败！不能选择重复的源单"),

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/CurrencyApi.java

@@ -7,7 +7,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "document-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "document-server")
 public interface CurrencyApi {
 
     @PostMapping("/currency/setStandard")

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/EmployeeApi.java

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.Map;
 
-@FeignClient(name = "document-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "document-server")
 public interface EmployeeApi {
 
     @GetMapping("/employee/getEmployeeByAccount")

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/ProductApi.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name = "document-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "document-server")
 public interface ProductApi {
 
     /**

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/VendorApi.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
-@FeignClient(name = "document-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "document-server")
 public interface VendorApi {
 
     /**

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/WarehouseApi.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
 
-@FeignClient(name = "document-server", configuration = ServiceFeignInterceptor.class)
+@FeignClient(name = "document-server")
 public interface WarehouseApi {
 
     @PostMapping("/warehouse/post")

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaledownMapper.java

@@ -33,4 +33,6 @@ public interface SaledownMapper {
     List<SaleDown> selectListByCon(@Param("con") String con, @Param("companyId") Long companyId);
 
     void batchUpdate(List<SaleDownDetail> updateDetails);
+
+    int checkToSale(Long id);
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleDown.java

@@ -64,8 +64,28 @@ public class SaleDown extends CommonBaseEntity{
 
     private String sa_salecode;
 
+    private Long sa_saleid;
+
     private String sa_sendstatus;
 
+    private Date sa_turndate;
+
+    public Date getSa_turndate() {
+        return sa_turndate;
+    }
+
+    public void setSa_turndate(Date sa_turndate) {
+        this.sa_turndate = sa_turndate;
+    }
+
+    public Long getSa_saleid() {
+        return sa_saleid;
+    }
+
+    public void setSa_saleid(Long sa_saleid) {
+        this.sa_saleid = sa_saleid;
+    }
+
     public String getSa_salecode() {
         return sa_salecode;
     }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleDownServiceImpl.java

@@ -113,6 +113,11 @@ public class SaleDownServiceImpl implements SaleDownService{
         if (StringUtils.isEmpty(id)){
             throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
+        //检测是否已转销售单
+        int check = saledownMapper.checkToSale(id);
+        if (check > 0) {
+            throw new BizException(BizExceptionCode.SALE_EXISTS_SALEDOWN);
+        }
         //查询主表信息
         SaleDown main = saledownMapper.selectByPrimaryKey(id);
         //查询从表
@@ -142,7 +147,17 @@ public class SaleDownServiceImpl implements SaleDownService{
         details = BeanMapper.mapList(items, SaleDetailDTO.class);
         saleFormDTO.setMain(map);
         saleFormDTO.setItems(details);
-        return saleService.saveFormData(saleFormDTO);
+        DocBaseDTO baseDTO = saleService.saveFormData(saleFormDTO);
+        //更新客户采购单状态
+        SaleDown sd = new SaleDown();
+        sd.setId(id);
+        sd.setSa_salecode(baseDTO.getCode());
+        sd.setSa_saleid(baseDTO.getId());
+        sd.setSa_turnstatus("已转销售");
+        sd.setSa_turnstatuscode("TURNSALE");
+        sd.setSa_turndate(new Date());
+        saledownMapper.updateByPrimaryKeySelective(sd);
+        return baseDTO;
     }
 
     @Override

applications/sale/sale-server/src/main/resources/mapper/SaledownMapper.xml

@@ -34,6 +34,7 @@
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="sa_salecode" property="sa_salecode" jdbcType="VARCHAR" />
     <result column="sa_sendstatus" property="sa_sendstatus" jdbcType="VARCHAR" />
+    <result column="sa_saleid" property="sa_saleid" jdbcType="INTEGER"/>
   </resultMap>
 
   <sql id="Base_Column_List" >
@@ -351,6 +352,21 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
+      <if test="sa_saleid != null" >
+        sa_saleid = #{sa_saleid,jdbcType=INTEGER},
+      </if>
+      <if test="sa_salecode != null" >
+        sa_salecode = #{sa_salecode,jdbcType=VARCHAR},
+      </if>
+      <if test="sa_turnstatus != null" >
+        sa_turnstatus = #{sa_turnstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="sa_turnstatuscode != null" >
+        sa_turnstatuscode = #{sa_turnstatuscode,jdbcType=VARCHAR},
+      </if>
+      <if test="sa_turndate != null" >
+        sa_turndate = #{sa_turndate,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where sa_id = #{id,jdbcType=INTEGER}
   </update>
@@ -465,4 +481,8 @@
       where sd_id = #{item.id,jdbcType=INTEGER}
     </foreach>
   </update>
+
+  <select id="checkToSale" parameterType="Long" resultType="int">
+    select count(1) from saledown where sa_id = #{id} and sa_turnstatuscode='TURNSALE'
+  </select>
 </mapper>