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

采购配置相关

Browse Source
20230922-ljl-fixBug
wangchaoxu 2 years ago
parent 719e8946c3
commit f6d402de7c
5 changed files with 1665 additions and 38 deletions
Show Stats Download Patch File Download Diff File

1542
doc/source/tool/class.OrderPrintTool.php
View File

File diff suppressed because it is too large Load Diff

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

@ -55,53 +55,20 @@ import com.ms.api.service.ProductToDsItemService;
import com.ms.api.service.PurchaseOrderService;
import com.ms.api.service.PurchaseSettingService;
import com.ms.api.service.ShopService;
import com.ms.api.tool.CommonTool;
import com.ms.api.tool.DsOrderTool;
import com.ms.api.tool.OrderTool;
import com.ms.api.tool.PurchaseTool;
import com.ms.api.tool.*;
import com.ms.api.util.DdRequestUtil;
import com.ms.api.util.WebUtil;
import com.ms.dal.bo.OpLogisticsPlatformBO;
import com.ms.dal.bo.OpOrderAddressHistoryBO;
import com.ms.dal.bo.OpOrderChildBO;
import com.ms.dal.bo.PurchaseOrderBO;
import com.ms.dal.entity.AfterSale;
import com.ms.dal.entity.DsAllowAutoPurchaseProduct;
import com.ms.dal.entity.DsFilterAutoPurchaseProduct;
import com.ms.dal.entity.DsPurchaseSetting;
import com.ms.dal.entity.OpOrder;
import com.ms.dal.entity.OpOrderAmountDetail;
import com.ms.dal.entity.OpOrderChildLogistics;
import com.ms.dal.entity.OpOrderEncryptIndex;
import com.ms.dal.entity.OpOrderExt;
import com.ms.dal.entity.OpOrderGivenProduct;
import com.ms.dal.entity.OpOrderOutstorageHistory;
import com.ms.dal.entity.OpOrderPhase;
import com.ms.dal.entity.OpOrderPriceProtection;
import com.ms.dal.entity.OpOrderRedpackInfo;
import com.ms.dal.entity.OpOrderSensitive;
import com.ms.dal.entity.ProductToDsItem;
import com.ms.dal.entity.PurchaseOrder;
import com.ms.dal.entity.PurchaseOrderItem;
import com.ms.dal.entity.PurchaseOrderSetting;
import com.ms.dal.entity.PurchaseSetting;
import com.ms.dal.entity.Shop;
import com.ms.dal.entity.ShopTo1688DsMember;
import com.ms.dal.mapper.DsAllowAutoPurchaseProductMapper;
import com.ms.dal.mapper.DsFilterAutoPurchaseProductMapper;
import com.ms.dal.mapper.DsPurchaseSettingMapper;
import com.ms.dal.mapper.OpOrderChildMapper;
import com.ms.dal.mapper.OpOrderEncryptIndexMapper;
import com.ms.dal.mapper.OpOrderMapper;
import com.ms.dal.mapper.PurchaseOrderItemMapper;
import com.ms.dal.mapper.PurchaseOrderMapper;
import com.ms.dal.mapper.PurchaseOrderSettingMapper;
import com.ms.dal.mapper.PurchaseSettingMapper;
import com.ms.dal.mapper.ShopTo1688DsMemberMapper;
import com.ms.dal.entity.*;
import com.ms.dal.mapper.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
*
@ -144,6 +111,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
@Autowired
private ShopTo1688DsMemberMapper shopTo1688DsMemberMapper;
@Autowired
private PurchaseSettingLogMapper purchaseSettingLogMapper;
@Autowired
private ShopService shopService;
@ -720,8 +690,54 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
return purchaseSettingDTO;
}
@Transactional
public boolean savePurchaseSetting(Long shopId, PurchaseSettingDTO purchaseSettingDTO) {
// todo:
if (purchaseSettingDTO == null) {
return false;
}
PurchaseSetting setting = new PurchaseSetting();
setting.setShopId(shopId);
setting.setIsAppendShopRemark(purchaseSettingDTO.getIsAppendShopRemark() != 0 && !StringUtils.isEmpty(purchaseSettingDTO.getAppendShopRemarkTpl()) ? 1 : 0);
setting.setIsAppendShopNote(purchaseSettingDTO.getIsAppendShopNote() != 0 && !StringUtils.isEmpty(purchaseSettingDTO.getAppendShopNoteTpl()) ? 1 : 0);
setting.setIsAutoFillRemark(purchaseSettingDTO.getIsAutoFillRemark() != 0 && !StringUtils.isEmpty(purchaseSettingDTO.getAutoFillRemarkTpl()) ? 1 : 0);
setting.setIsAutoFillOrderMemo(purchaseSettingDTO.getIsAutoFillOrderMemo() != 0 && !StringUtils.isEmpty(purchaseSettingDTO.getAutoFillOrderMemoTpl()) ? 1 : 0);
setting.setAppendShopRemarkTpl(purchaseSettingDTO.getAppendShopRemarkTpl());
setting.setAppendShopNoteTpl(purchaseSettingDTO.getAppendShopNoteTpl());
setting.setAutoFillRemarkTpl(purchaseSettingDTO.getAutoFillRemarkTpl());
setting.setAutoFillOrderMemoTpl(purchaseSettingDTO.getAutoFillOrderMemoTpl());
if (OrderPrintTool.getOrderFlag(purchaseSettingDTO.getShopRemarkFlag()) != null) {
setting.setShopRemarkFlag(purchaseSettingDTO.getShopRemarkFlag());
} else {
setting.setShopRemarkFlag(0);
}
setting.setGmtModified(new Date());
PurchaseSetting oldSetting = purchaseSettingMapper.selectByShopId(shopId);
String oldSettingJson;
if (oldSetting == null) {
setting.setGmtCreate(new Date());
purchaseSettingMapper.insert(setting);
oldSettingJson = "[]";
} else {
purchaseSettingMapper.updateByShopId(setting);
oldSettingJson = JSONObject.toJSONString(oldSetting);
}
PurchaseSettingLog purchaseSettingLog = new PurchaseSettingLog();
purchaseSettingLog.setShopId(shopId);
purchaseSettingLog.setSource("savePurchaseSetting");
purchaseSettingLog.setData(JSONObject.toJSONString(setting));
purchaseSettingLog.setBeforeData(oldSettingJson);
// todo: 当前操作员信息补充
// purchaseSettingLog.setOperateShopId(shopId);
// purchaseSettingLog.setOperateIp();
purchaseSettingLog.setGmtCreate(new Date());
purchaseSettingLog.setGmtModified(new Date());
purchaseSettingLogMapper.insert(purchaseSettingLog);
return false;
}

28
ms-biz/src/main/java/com/ms/api/tool/OrderPrintTool.java
Unescape Escape View File

@ -0,0 +1,28 @@
package com.ms.api.tool;
import java.util.HashMap;
import java.util.Map;
public class OrderPrintTool {
private static final Map<Integer, String> orderFlagMap = new HashMap<>();
static {
orderFlagMap.put(0, "flag-gray.png");
orderFlagMap.put(1, "flag-purple.png");
orderFlagMap.put(2, "flag-cyan.png");
orderFlagMap.put(3, "flag-green.png");
orderFlagMap.put(4, "flag-orange.png");
orderFlagMap.put(5, "flag-red.png");
}
/**
* 获取备注旗帜
* @param flag
* @return
*/
public static String getOrderFlag(int flag) {
return orderFlagMap.get(flag);
}
}

2
ms-dal/src/main/java/com/ms/dal/mapper/PurchaseSettingMapper.java
Unescape Escape View File

@ -23,4 +23,6 @@ public interface PurchaseSettingMapper {
int updateByPrimaryKey(PurchaseSetting record);
PurchaseSetting selectByShopId(Long shopId);
int updateByShopId(PurchaseSetting record);
}

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

@ -147,4 +147,43 @@
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
where purchase_setting_id = #{purchaseSettingId,jdbcType=BIGINT}
</update>
<update id="updateByShopId" parameterType="com.ms.dal.entity.PurchaseSetting">
update purchase_setting
<set>
<if test="isAppendShopRemark != null">
is_append_shop_remark = #{isAppendShopRemark,jdbcType=BOOLEAN},
</if>
<if test="appendShopRemarkTpl != null">
append_shop_remark_tpl = #{appendShopRemarkTpl,jdbcType=VARCHAR},
</if>
<if test="isAppendShopNote != null">
is_append_shop_note = #{isAppendShopNote,jdbcType=BOOLEAN},
</if>
<if test="appendShopNoteTpl != null">
append_shop_note_tpl = #{appendShopNoteTpl,jdbcType=VARCHAR},
</if>
<if test="shopRemarkFlag != null">
shop_remark_flag = #{shopRemarkFlag,jdbcType=TINYINT},
</if>
<if test="isAutoFillRemark != null">
is_auto_fill_remark = #{isAutoFillRemark,jdbcType=BOOLEAN},
</if>
<if test="autoFillRemarkTpl != null">
auto_fill_remark_tpl = #{autoFillRemarkTpl,jdbcType=VARCHAR},
</if>
<if test="isAutoFillOrderMemo != null">
is_auto_fill_order_memo = #{isAutoFillOrderMemo,jdbcType=BOOLEAN},
</if>
<if test="autoFillOrderMemoTpl != null">
auto_fill_order_memo_tpl = #{autoFillOrderMemoTpl,jdbcType=VARCHAR},
</if>
<if test="gmtCreate != null">
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
</if>
<if test="gmtModified != null">
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
</if>
</set>
where shop_id = #{shopId,jdbcType=BIGINT}
</update>
</mapper>

Write Preview
Loading…
Cancel
Save