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 1 year ago
parent 8514490790
commit dcb6c27e9b
5 changed files with 68 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
ms-biz/src/main/java/com/ms/api/service/PurchaseOrderService.java
Unescape Escape View File

@ -44,6 +44,8 @@ public interface PurchaseOrderService {
boolean saveDsPurchaseSetting(Long shopId, DsPurchaseSettingDTO dsPurchaseSettingDTO);
boolean saveDsAutoPurchaseAgreement(Long shopId);
List<PurchaseOrder> selectByConditions(PurchaseOrder build);
ApiResult checkAllowDsAutoPurchase(Long shopId, String orderId, DsPurchaseSettingDTO autoPurchaseSetting, int orderStatus, Date orderGmtPayTime, Boolean isDsOpOrder);

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

@ -85,6 +85,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
@Autowired
private DsAutoPurchaseSwitchLogMapper dsAutoPurchaseSwitchLogMapper;
@Autowired
private DsAutoPurchaseAgreementMapper dsAutoPurchaseAgreementMapper;
@Autowired
private ShopService shopService;
@ -614,6 +617,27 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
return rows.stream().collect(Collectors.toMap(PurchaseOrderSetting::getPurchaseOrderId, x -> x));
}
public boolean saveDsAutoPurchaseAgreement(Long shopId) {
DsAutoPurchaseAgreement obj = new DsAutoPurchaseAgreement();
obj.setShopId(shopId);
// 之前版本都是从session取，这边后续处理 todo:
obj.setOperateShopId(shopId);
// obj.setOperateIp("");
// obj.setOperateMemberId("");
obj.setGmtModified(new Date());
DsAutoPurchaseAgreement row = dsAutoPurchaseAgreementMapper.getByShopId(shopId);
int affRow;
if (row == null) {
obj.setGmtCreate(new Date());
affRow = dsAutoPurchaseAgreementMapper.insertSelective(obj);
} else {
obj.setDsAutoPurchaseAgreementId(row.getDsAutoPurchaseAgreementId());
affRow = dsAutoPurchaseAgreementMapper.updateByPrimaryKeySelective(obj);
}
return affRow > 0;
}
public PurchaseSettingDTO getPurchaseSetting(Long shopId) {
PurchaseSetting purchaseSetting = purchaseSettingMapper.selectByShopId(shopId);
// boolean isNewestVersion = purchaseSetting.version = PurchaseOrderConst.CURRENT_PURCHASE_SETTING_VERSION;

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

@ -4,22 +4,38 @@ import com.jinritemai.cloud.base.api.BaseRequest;
import com.jinritemai.cloud.base.api.BaseResponse;
import com.jinritemai.cloud.base.api.ExtensionService;
import com.jinritemai.cloud.base.api.ExtensionServiceHandler;
import com.ms.api.common.R;
import com.ms.api.common.Ret;
import com.ms.api.common.SPIBaseService;
import com.ms.api.dto.order.SaveDsAutoPurchaseAgreementRequestDTO;
import com.ms.api.service.PurchaseOrderService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ExtensionService("saveDsAutoPurchaseAgreement")
@Slf4j
@AllArgsConstructor
public class SaveDsAutoPurchaseAgreementService extends SPIBaseService implements ExtensionServiceHandler<SaveDsAutoPurchaseAgreementRequestDTO, Ret> {
@Autowired
private PurchaseOrderService purchaseOrderService;
@Override
public BaseResponse<Ret> handle(BaseRequest<SaveDsAutoPurchaseAgreementRequestDTO> req) {
initHandle(req);
Long shopId = Long.valueOf(this.shopId);
return null;
SaveDsAutoPurchaseAgreementRequestDTO requestDTO = req.getData();
if (requestDTO.getIsCheckedAgreement() == null || requestDTO.getIsCheckedAgreement() == 0) {
return R.ok(Ret.fail("未勾选使用协议"));
}
if (!purchaseOrderService.saveDsAutoPurchaseAgreement(shopId)) {
return R.ok(Ret.fail("保存用户协议失败"));
}
return R.ok(Ret.success());
}
}

1
ms-dal/src/main/java/com/ms/dal/mapper/DsAutoPurchaseAgreementMapper.java
Unescape Escape View File

@ -21,4 +21,5 @@ public interface DsAutoPurchaseAgreementMapper {
int updateByPrimaryKey(DsAutoPurchaseAgreement record);
DsAutoPurchaseAgreement getByShopId(Long shopId);
}

43
ms-dal/src/main/resources/mapper/DsAutoPurchaseAgreementMapper.xml
Unescape Escape View File

@ -24,12 +24,17 @@
select
<include refid="Base_Column_List" />
from ds_auto_purchase_agreement
where ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT}
where ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT}
</select>
<select id="selectByShopId" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from ds_auto_purchase_agreement where shop_id = #{shopId,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from ds_auto_purchase_agreement
where ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT}
where ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT}
</delete>
<insert id="insert" keyColumn="ds_auto_purchase_agreement_id" keyProperty="dsAutoPurchaseAgreementId" parameterType="com.ms.dal.entity.DsAutoPurchaseAgreement" useGeneratedKeys="true">
insert into ds_auto_purchase_agreement
@ -43,22 +48,22 @@
<insert id="insertSelective" keyColumn="ds_auto_purchase_agreement_id" keyProperty="dsAutoPurchaseAgreementId" parameterType="com.ms.dal.entity.DsAutoPurchaseAgreement" useGeneratedKeys="true">
insert into ds_auto_purchase_agreement
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="dsAutoPurchaseAgreementId != null">dsAutoPurchaseAgreementId,</if>
<if test="shopId != null">shopId,</if>
<if test="operateShopId != null">operateShopId,</if>
<if test="operateIp != null">operateIp,</if>
<if test="operateMemberId != null">operateMemberId,</if>
<if test="gmtCreate != null">gmtCreate,</if>
<if test="gmtModified != null">gmtModified,</if>
<if test="dsAutoPurchaseAgreementId != null">ds_auto_purchase_agreement_id,</if>
<if test="shopId != null">shop_id,</if>
<if test="operateShopId != null">operate_shop_id,</if>
<if test="operateIp != null">operate_ip,</if>
<if test="operateMemberId != null">operate_member_id,</if>
<if test="gmtCreate != null">gmt_create,</if>
<if test="gmtModified != null">gmt_modified,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="dsAutoPurchaseAgreementId != null">ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT},</if>
<if test="shopId != null">shop_id = #{shopId,jdbcType=BIGINT},</if>
<if test="operateShopId != null">operate_shop_id = #{operateShopId,jdbcType=BIGINT},</if>
<if test="operateIp != null">operate_ip = #{operateIp,jdbcType=VARCHAR},</if>
<if test="operateMemberId != null">operate_member_id = #{operateMemberId,jdbcType=VARCHAR},</if>
<if test="gmtCreate != null">gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},</if>
<if test="gmtModified != null">gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},</if>
<if test="dsAutoPurchaseAgreementId != null">#{dsAutoPurchaseAgreementId,jdbcType=BIGINT},</if>
<if test="shopId != null">#{shopId,jdbcType=BIGINT},</if>
<if test="operateShopId != null">#{operateShopId,jdbcType=BIGINT},</if>
<if test="operateIp != null">#{operateIp,jdbcType=VARCHAR},</if>
<if test="operateMemberId != null">#{operateMemberId,jdbcType=VARCHAR},</if>
<if test="gmtCreate != null">#{gmtCreate,jdbcType=TIMESTAMP},</if>
<if test="gmtModified != null">#{gmtModified,jdbcType=TIMESTAMP},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.ms.dal.entity.DsAutoPurchaseAgreement">
@ -83,17 +88,17 @@
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
</if>
</set>
where ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT}
where ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ms.dal.entity.DsAutoPurchaseAgreement">
update ds_auto_purchase_agreement
set
set
shop_id = #{shopId,jdbcType=BIGINT},
operate_shop_id = #{operateShopId,jdbcType=BIGINT},
operate_ip = #{operateIp,jdbcType=VARCHAR},
operate_member_id = #{operateMemberId,jdbcType=VARCHAR},
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
where ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT}
where ds_auto_purchase_agreement_id = #{dsAutoPurchaseAgreementId,jdbcType=BIGINT}
</update>
</mapper>

Write Preview
Loading…
Cancel
Save