elf
/
honor-dd-light-ds-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java

Browse Source
20230922-ljl-fixBug
cxxxxxxx详 1 year ago
parent f96326b89d f33701895b
commit 5d2fe3b5b6
8 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File

16
ms-api/src/main/java/com/ms/api/dto/order/DsPurchaseSettingDTO.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.ms.api.dto.order;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Map;
@Data
@ -68,6 +69,21 @@ public class DsPurchaseSettingDTO {
*/
private int isForbidIsolationPurchase;
/**
* 数据创建时间
*/
private Date gmtCreate;
/**
* 数据修改时间
*/
private Date gmtModified;
/**
* 自动采购首次开启时间
*/
private Date gmtIsAutoPurchase;
/**
* 要过滤自动采购的商品
*/

21
ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java
Unescape Escape View File

@ -660,8 +660,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
isAutoFillOrderMemo = 0;
appendShopRemarkTpl = PurchaseTool.getDefaultAppendVenderRemarkTpl();
appendShopNoteTpl = PurchaseTool.getDefaultAppendVenderRemarkTpl();
autoFillRemarkTpl = null;
autoFillOrderMemoTpl = null;
autoFillRemarkTpl = "";
autoFillOrderMemoTpl = "";
} else {
isAppendShopRemark = purchaseSetting.getIsAppendShopRemark();
isAppendShopNote = purchaseSetting.getIsAppendShopNote();
@ -732,12 +732,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
purchaseSettingLog.setSource("savePurchaseSetting");
purchaseSettingLog.setData(JSONObject.toJSONString(setting));
purchaseSettingLog.setBeforeData(oldSettingJson);
// todo: 当前操作员信息补充
// purchaseSettingLog.setOperateShopId(shopId);
// purchaseSettingLog.setOperateIp();
// todo: 当前操作员ID和IP补充
purchaseSettingLog.setOperateShopId(shopId);
// purchaseSettingLog.setOperateIp("");
purchaseSettingLog.setGmtCreate(new Date());
purchaseSettingLog.setGmtModified(new Date());
purchaseSettingLogMapper.insert(purchaseSettingLog);
purchaseSettingLogMapper.insertSelective(purchaseSettingLog);
return false;
}
@ -783,6 +784,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
ret.setIsUseAllProduct(1);
ret.setIsUsePartProduct(0);
ret.setIsForbidIsolationPurchase(0);
ret.setGmtCreate(null);
ret.setGmtModified(null);
ret.setGmtIsAutoPurchase(null);
} else {
ret.setIsPurchaseLogisticsUpdateToPlatform(dsPurchaseSetting.getIsPurchaseLogisticsUpdateToPlatform());
ret.setDeliveryTimeType(dsPurchaseSetting.getDeliveryTimeType());
@ -796,6 +800,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
ret.setIsUseAllProduct(dsPurchaseSetting.getIsUseAllProduct());
ret.setIsUsePartProduct(dsPurchaseSetting.getIsUsePartProduct());
ret.setIsForbidIsolationPurchase(dsPurchaseSetting.getIsForbidIsolationPurchase());
ret.setGmtCreate(dsPurchaseSetting.getGmtCreate());
ret.setGmtModified(dsPurchaseSetting.getGmtModified());
ret.setGmtIsAutoPurchase(dsPurchaseSetting.getGmtIsAutoPurchase());
}
ret.setFilterAutoPurchaseProducts(filterAutoPurchaseProductMap);
@ -841,7 +848,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
obj.setGmtCreate(new Date());
obj.setGmtModified(new Date());
return dsPurchaseSettingMapper.insert(obj);
return dsPurchaseSettingMapper.insertSelective(obj);
}
public List<JSONObject> getOrderAndPurchaseOrdersMap(String shopId, List<String> shopIds,

5
ms-biz/src/main/java/com/ms/api/spi/order/GetPurchaseSettingService.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.ms.api.dto.order.GetPurchaseSettingResponseDTO;
import com.ms.api.dto.order.PurchaseSettingDTO;
import com.ms.api.service.PurchaseOrderService;
import com.ms.api.tool.DsJsonRequestTemplate;
import com.ms.api.tool.SecurityTool;
import com.ms.api.util.PurchaseOrderUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -45,7 +46,7 @@ public class GetPurchaseSettingService extends SPIBaseService implements Extensi
Map platformShopSetting = null;
try {
Map<String, String> params = new HashMap<>();
params.put("userId", shopId.toString());
params.put("userId", SecurityTool.encodeByAES(String.valueOf(shopId)));
params.put("platform", "ddMicroApp");
String res = dsJsonRequestTemplate.execute("/ds_setting/getPlatformShopPurchaseSetting", params);
log.info(res);
@ -59,7 +60,7 @@ public class GetPurchaseSettingService extends SPIBaseService implements Extensi
Map dsSetting = null;
try {
Map<String, String> params = new HashMap<>();
params.put("userId", shopId.toString());
params.put("userId", SecurityTool.encodeByAES(String.valueOf(shopId)));
params.put("platform", "ddMicroApp");
String res = dsJsonRequestTemplate.execute("/order/getPurchaseSetting", params);
log.info(res);

4
ms-dal/src/main/resources/mapper/DsAllowAutoPurchaseProductMapper.xml
Unescape Escape View File

@ -28,7 +28,9 @@
where ds_allow_auto_purchase_product_id = #{dsAllowAutoPurchaseProductId,jdbcType=BIGINT}
</select>
<select id="getListByShopId" resultMap="BaseResultMap">
select * from ds_allow_auto_purchase_product where shop_id = #{shopId}
select
<include refid="Base_Column_List" />
from ds_allow_auto_purchase_product where shop_id = #{shopId,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from ds_allow_auto_purchase_product

4
ms-dal/src/main/resources/mapper/DsFilterAutoPurchaseProductMapper.xml
Unescape Escape View File

@ -28,7 +28,9 @@
where ds_filter_auto_purchase_product_id = #{dsFilterAutoPurchaseProductId,jdbcType=BIGINT}
</select>
<select id="getListByShopId" resultMap="BaseResultMap">
select * from ds_filter_auto_purchase_product where shop_id = #{shopId}
select
<include refid="Base_Column_List" />
from ds_filter_auto_purchase_product where shop_id = #{shopId,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

7
ms-dal/src/main/resources/mapper/DsPurchaseSettingMapper.xml
Unescape Escape View File

@ -44,10 +44,13 @@
from ds_purchase_setting
where ds_purchase_setting_id = #{dsPurchaseSettingId,jdbcType=BIGINT}
</select>
<select id="selectByShopId" resultType="com.ms.dal.entity.DsPurchaseSetting">
select * from ds_purchase_setting where shop_id = #{shopId}
<select id="selectByShopId" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ds_purchase_setting where shop_id = #{shopId,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from ds_purchase_setting
where ds_purchase_setting_id = #{dsPurchaseSettingId,jdbcType=BIGINT}

6
ms-dal/src/main/resources/mapper/PurchaseSettingMapper.xml
Unescape Escape View File

@ -34,8 +34,10 @@
from purchase_setting
where purchase_setting_id = #{purchaseSettingId,jdbcType=BIGINT}
</select>
<select id="selectByShopId" resultType="com.ms.dal.entity.PurchaseSetting">
select * from purchase_setting where shop_id = #{shopId}
<select id="selectByShopId" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from purchase_setting where shop_id = #{shopId,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

6
ms-dal/src/main/resources/mapper/ShopTo1688DsMemberMapper.xml
Unescape Escape View File

@ -26,8 +26,10 @@
from shop_to_1688_ds_member
where shop_to_1688_ds_member_id = #{shopTo1688DsMemberId,jdbcType=BIGINT}
</select>
<select id="selectByShopId" resultType="com.ms.dal.entity.ShopTo1688DsMember">
select * from shop_to_1688_ds_member where shop_id = #{shopId}
<select id="selectByShopId" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from shop_to_1688_ds_member where shop_id = #{shopId,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

Write Preview
Loading…
Cancel
Save