禅道1289修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICorpsDescClient.java

@@ -1,5 +1,6 @@
 package org.springblade.client.feign;
 
+import org.springblade.client.entity.CorpsAddr;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.vo.CorpsDescVO;
@@ -40,7 +41,8 @@ public interface ICorpsDescClient {
 	String GET_AGENT_CODE = API_PREFIX + "/getAgentCode";
 	String GET_CORP = API_PREFIX + "getCorp";
 	String GET_CORP_ID = API_PREFIX + "getCorpId";
-
+	String GRT_CORPS_ADDR = API_PREFIX + "/getCorpsAddr";
+	String GRT_CORPS_BANK = API_PREFIX + "/getCorpsBank";
 	@PostMapping(CORPS_UPDATE)
 	R corpsUpdate(@RequestBody CorpsDesc corpsDesc);
 
@@ -156,4 +158,10 @@ public interface ICorpsDescClient {
 	 */
 	@PostMapping(GET_CORP)
 	List<CorpsDesc> getCorp(@RequestBody CorpsDesc corpsDesc);
+	@GetMapping(GRT_CORPS_ADDR)
+	List<CorpsAddr> getCorpsAddr(@RequestParam("pid") Long pid,
+								 @RequestParam("tenantId")String tenantId);
+	@GetMapping(GRT_CORPS_BANK)
+	List<CorpsBank> getCorpsBank(@RequestParam("pid") Long pid,
+								 @RequestParam("tenantId")String tenantId);
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/feign/CorpsDescClient.java

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.client.corps.assemble.mapstruct.CorpsDescMapstructMapper;
+import org.springblade.client.corps.service.ICorpsAddrService;
 import org.springblade.client.corps.service.ICorpsAttnService;
 import org.springblade.client.corps.service.ICorpsBankService;
 import org.springblade.client.corps.service.ICorpsDescService;
+import org.springblade.client.entity.CorpsAddr;
 import org.springblade.client.entity.CorpsAttn;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.entity.CorpsDesc;
@@ -47,6 +49,8 @@ public class CorpsDescClient implements ICorpsDescClient {
 
 	private final IGoodsTypeService goodsTypeService;
 
+	private final ICorpsAddrService corpsAddrService;
+
 	@Override
 	@PostMapping(CORPS_UPDATE)
 	public R corpsUpdate(CorpsDesc corpsDesc) {
@@ -179,6 +183,16 @@ public class CorpsDescClient implements ICorpsDescClient {
 	}
 
 	@Override
+	public List<CorpsAddr> getCorpsAddr(Long pid, String tenantId) {
+		return corpsAddrService.getCorpsAddr(pid,tenantId);
+	}
+
+	@Override
+	public List<CorpsBank> getCorpsBank(Long pid, String tenantId) {
+		return bankService.getCorpsBank(pid,tenantId);
+	}
+
+	@Override
 	public List<Long> getGoodTypeMessage(Long goodTypeId) {
 		return goodsTypeService.goodTypeIdList(goodTypeId.toString());
 	}

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsAddrMapper.java

@@ -16,9 +16,11 @@
  */
 package org.springblade.client.corps.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.client.entity.CorpsAddr;
 import org.springblade.client.entity.CorpsAttn;
+import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.vo.CorpsAddrVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,5 +51,13 @@ public interface CorpsAddrMapper extends BaseMapper<CorpsAddr> {
 	CorpsAddr selectCorpsAddrCode(@Param("addr") String addr,
 								  @Param("pid")Long pid,
 								  @Param("tenantId") String tenantId);
+	/**
+	 * 查询客户地址信息信息
+	 *
+	 * @return
+	 */
+	@SqlParser(filter=true)
+	List<CorpsAddr> getCorpsAddr(@Param("pid") Long pid,
+							 @Param("tenantId") String tenantId);
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsAddrMapper.xml

@@ -33,5 +33,12 @@
           and pid = #{pid}
           and tenant_id = #{tenantId}
     </select>
+    <select id="getCorpsAddr" resultMap="corpsAddrResultMap">
+        select *
+        from basic_corps_attn
+        where is_deleted = 0
+          and pid = #{pid}
+          and tenant_id = #{tenantId}
+    </select>
 
 </mapper>

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsBankMapper.java

@@ -1,7 +1,10 @@
 package org.springblade.client.corps.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.client.entity.CorpsAddr;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.vo.CorpsBankVO;
 
@@ -23,5 +26,13 @@ public interface CorpsBankMapper extends BaseMapper<CorpsBank> {
 	 * @return
 	 */
 	List<CorpsBankVO> selectCorpsBankPage(IPage page, CorpsBankVO corpsBank);
+	/**
+	 * 查询客户银行信息信息
+	 *
+	 * @return
+	 */
+	@SqlParser(filter=true)
+	List<CorpsBank> getCorpsBank(@Param("pid") Long pid,
+								 @Param("tenantId") String tenantId);
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsBankMapper.xml

@@ -28,5 +28,12 @@
         from basic_corps_bank
         where is_deleted = 0
     </select>
+    <select id="getCorpsBank" resultMap="corpsBankResultMap">
+        select *
+        from basic_corps_bank
+        where is_deleted = 0
+          and pid = #{pid}
+          and tenant_id = #{tenantId}
+    </select>
 
 </mapper>

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/ICorpsAddrService.java

@@ -21,6 +21,8 @@ import org.springblade.client.vo.CorpsAddrVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 客户收发货地址 服务类
  *
@@ -38,4 +40,12 @@ public interface ICorpsAddrService extends IService<CorpsAddr> {
 	 */
 	IPage<CorpsAddrVO> selectCorpsAddrPage(IPage<CorpsAddrVO> page, CorpsAddrVO corpsAddr);
 
+	/**
+	 * 根据客户id，租户获取客户地址信息
+	 * @param pid 客户id
+	 * @param tenantId 租户
+	 * @return
+	 */
+	List<CorpsAddr> getCorpsAddr(Long pid,String tenantId);
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/ICorpsBankService.java

@@ -1,10 +1,13 @@
 package org.springblade.client.corps.service;
 
+import org.springblade.client.entity.CorpsAddr;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.vo.CorpsBankVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 客户银行 服务类
  *
@@ -21,5 +24,12 @@ public interface ICorpsBankService extends IService<CorpsBank> {
 	 * @return
 	 */
 	IPage<CorpsBankVO> selectCorpsBankPage(IPage<CorpsBankVO> page, CorpsBankVO corpsBank);
+	/**
+	 * 根据客户id，租户获取客户银行信息
+	 * @param pid 客户id
+	 * @param tenantId 租户
+	 * @return
+	 */
+	List<CorpsBank> getCorpsBank(Long pid, String tenantId);
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsAddrServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 客户收发货地址 服务实现类
@@ -45,6 +46,12 @@ public class CorpsAddrServiceImpl extends ServiceImpl<CorpsAddrMapper, CorpsAddr
 	public IPage<CorpsAddrVO> selectCorpsAddrPage(IPage<CorpsAddrVO> page, CorpsAddrVO corpsAddr) {
 		return page.setRecords(baseMapper.selectCorpsAddrPage(page, corpsAddr));
 	}
+
+	@Override
+	public List<CorpsAddr> getCorpsAddr(Long pid, String tenantId) {
+		return baseMapper.getCorpsAddr(pid,tenantId);
+	}
+
 	public R saveOrUpdateAddr(CorpsDesc corpsDesc, Long userId, Long pId, String tenantId, Date date){
 		if (CollectionUtils.isNotEmpty(corpsDesc.getCorpsAddrList())){
 			for (CorpsAddr corpsAddr : corpsDesc.getCorpsAddrList()) {

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsBankServiceImpl.java

@@ -8,6 +8,8 @@ import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.vo.CorpsBankVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 客户银行 服务实现类
  *
@@ -22,4 +24,9 @@ public class CorpsBankServiceImpl extends ServiceImpl<CorpsBankMapper, CorpsBank
 		return page.setRecords(baseMapper.selectCorpsBankPage(page, corpsBank));
 	}
 
+	@Override
+	public List<CorpsBank> getCorpsBank(Long pid, String tenantId) {
+		return baseMapper.getCorpsBank(pid,tenantId);
+	}
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/mapper/SerialMapper.java

@@ -56,5 +56,9 @@ public interface SerialMapper extends BaseMapper<Serial> {
 						@Param("billPrefix") String billPrefix,
 						@Param("tenantId") String tenantId,
 						@Param("serialType") String serialType);
+	@SqlParser(filter=true)
+	int updateMessage(Serial serial);
+	@SqlParser(filter=true)
+	int insertSerialMessage(Serial serial);
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/mapper/SerialMapper.xml

@@ -38,5 +38,59 @@
 	        AND trade_type = #{tradeType}
 	        AND serial_type = #{serialType}
     </select>
+    <update id="updateMessage" parameterType="org.springblade.client.entity.Serial">
+        update  basic_serial
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="billType != null">bill_type = #{billType},</if>
+            <if test="billPrefix != null">bill_prefix = #{billPrefix},</if>
+            <if test="serial != null">serial = #{serial},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="createUser != null">create_user = #{createUser},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateUser != null">update_user = #{updateUser},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="tradeType != null">trade_type = #{tradeType},</if>
+            <if test="serialType != null">serial_type = #{serialType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <insert id="insertSerialMessage" parameterType="org.springblade.client.entity.Serial" useGeneratedKeys="true" keyProperty="fId">
+        insert into basic_serial
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="billType != null">bill_type,</if>
+            <if test="billPrefix != null">bill_prefix,</if>
+            <if test="serial != null">serial,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="version != null">version,</if>
+            <if test="createUser != null">create_user,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateUser != null">update_user,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="tradeType != null">trade_type,</if>
+            <if test="serialType != null">serial_type,</if>
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="createDept != null">create_dept,</if>
+            <if test="status != null">status,</if>
+            <if test="isDeleted != null">is_deleted,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="billType != null">#{billType},</if>
+            <if test="billPrefix != null">#{billPrefix},</if>
+            <if test="serial != null">#{serial},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="version != null">#{version},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="tradeType != null">#{tradeType},</if>
+            <if test="serialType != null">#{serialType},</if>
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="createDept != null">#{createDept},</if>
+            <if test="status != null">#{status},</if>
+            <if test="isDeleted != null">#{isDeleted},</if>
+        </trim>
+    </insert>
 
 </mapper>

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/SerialServiceImpl.java

@@ -126,7 +126,7 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 			yyyyMM = DateFormatUtils.format(date, "yyMMdd");
 			if (serial != null) {
 				serial.setSerial(serial.getSerial() + 1);
-				baseMapper.updateById(serial);
+				baseMapper.updateMessage(serial);
 				if (serial.getSerial() <= 9) {
 					billNo = "00" + serial.getSerial()+ "-" + yyyyMM ;
 				} else if (serial.getSerial() <= 99) {
@@ -137,12 +137,12 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 			} else {
 				billNo =  "001-" + yyyyMM ;
 				billNoSerial.setSerial(1);
-				baseMapper.insert(billNoSerial);
+				baseMapper.insertSerialMessage(billNoSerial);
 			}
 		}else {
 			if (serial != null) {
 				serial.setSerial(serial.getSerial() + 1);
-				baseMapper.updateById(serial);
+				baseMapper.updateMessage(serial);
 				if (serial.getSerial() <= 9) {
 					billNo = yyyyMM + "00" + serial.getSerial();
 				} else if (serial.getSerial() <= 99) {
@@ -153,7 +153,7 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 			} else {
 				billNo = yyyyMM + "001";
 				billNoSerial.setSerial(1);
-				baseMapper.insert(billNoSerial);
+				baseMapper.insertSerialMessage(billNoSerial);
 			}
 		}
 		return type+billNo;

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.purchase.sales.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.javafx.collections.MappingChange;
 import com.trade.purchase.order.vo.OrderDTO;
@@ -89,4 +90,12 @@ public interface OrderMapper extends BaseMapper<Order> {
 						  @Param("tradeType") String tradeType,
 						  @Param("billType") String billType,
 						  @Param("orderStatus") String orderStatus);
+
+	/**
+	 * 更新订单信息
+	 * @param order
+	 * @return
+	 */
+	@SqlParser(filter=true)
+	int updateOrderMessage(Order order);
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -552,4 +552,12 @@ ORDER BY
             AND bo.order_status = #{orderStatus}
         </if>
     </select>
+    <update id="updateOrderMessage" parameterType="org.springblade.purchase.sales.entity.Order">
+        update  business_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="generate != null">generate = #{generate},</if>
+            <if test="orderStatus != null">order_status = #{orderStatus},</if>
+        </trim>
+        where id = #{id}
+    </update>
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -1372,7 +1372,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		Order purchase = new Order();
 		purchase.setId(order.getSrcId());
 		purchase.setOrderStatus("平台审核通过");
-		baseMapper.updateById(purchase);
+		baseMapper.updateOrderMessage(purchase);
 		//生成平台销售订单
 		Order market = new Order();
 		BeanUtil.copy(order,market);
@@ -1504,7 +1504,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		indent.setId(order.getSrcId());
 		indent.setOrderStatus("平台拒绝接单");
 		indent.setGenerate(0);//平台拒绝，代理商可以再次提交采购合同
-		baseMapper.updateById(indent);
+		baseMapper.updateOrderMessage(indent);
 	}
 
 	/**

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/PurchaseServiceImpl.java

@@ -17,9 +17,7 @@ import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.check.feign.ICheckClient;
-import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.GoodsDesc;
-import org.springblade.client.entity.GoodsType;
+import org.springblade.client.entity.*;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.feign.ISerialClient;
@@ -132,13 +130,33 @@ public class PurchaseServiceImpl extends ServiceImpl<OrderMapper, Order> impleme
 		purchase.setCorpId(agentCode.getId());//客户
 		purchase.setProductionPlant(supplier.getId());//生成工厂
 		purchase.setPackageRemarks(packageRemarks);//包装要求
-		purchase.setBanks(corpsDesc.getAccountNo());//银行账号
-		purchase.setBanksAccountName(corpsDesc.getAccountName());//公司户头
-		purchase.setAccountBank(corpsDesc.getAccountBank());//开户银行
-		purchase.setShippingAddress(supplier.getStorageAddr());//发货地址
 		purchase.setStatus(1);//审批状态
 		purchase.setOrderStatus(OrderTypeEnum.SUBMIT.getType());
-		purchase.setArrivalAddress(agentCode.getStorageAddr());//到货地址
+		//获取所属公司的银行账号信息
+		List<CorpsBank> corpsBank = corpsDescClient.getCorpsBank(corpsDesc.getId(), tenant.getTerrace());
+		if (CollectionUtils.isNotEmpty(corpsBank)){
+			purchase.setBanks(corpsBank.get(0).getAccountNo());//银行账号
+			purchase.setBanksAccountName(corpsBank.get(0).getAccountName());//公司户头
+			purchase.setAccountBank(corpsBank.get(0).getAccountBank());//开户银行
+		}else {
+			purchase.setBanks(corpsDesc.getAccountNo());//银行账号
+			purchase.setBanksAccountName(corpsDesc.getAccountName());//公司户头
+			purchase.setAccountBank(corpsDesc.getAccountBank());//开户银行
+		}
+		//获取发货地址
+		List<CorpsAddr> corpsAddr = corpsDescClient.getCorpsAddr(supplier.getId(), tenant.getTerrace());
+		if (CollectionUtils.isNotEmpty(corpsAddr)){
+			purchase.setShippingAddress(corpsAddr.get(0).getAddr());//发货地址
+		}else {
+			purchase.setShippingAddress(supplier.getStorageAddr());//发货地址
+		}
+		//获取到货地址
+		List<CorpsAddr> addr = corpsDescClient.getCorpsAddr(agentCode.getId(), tenant.getTerrace());
+		if (CollectionUtils.isNotEmpty(addr)){
+			purchase.setArrivalAddress(addr.get(0).getAddr());//到货地址
+		}else {
+			purchase.setArrivalAddress(agentCode.getStorageAddr());//到货地址
+		}
 		//生成系统编号
 		R billNo = serialClient.getNo(purchase.getBillType(), purchase.getTradeType(), purchase.getBillType(),tenant.getTerrace());
 		if (billNo.getCode() != 200) {