suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-06-04 09:40:00 +08:00
parent 08afc93c94
commit 51a3da146c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
View File

@@ -388,7 +388,7 @@
</if> </if>
</select> </select>
<select id="getFranchiseFeePayInfoByShopId" resultType="com.cool.store.entity.LinePayDO"> <select id="getFranchiseFeePayInfoByShopId" resultType="com.cool.store.entity.LinePayDO">
select * from xfsg_line_pay where deleted = 0 and shop_id = #{shopId} and pay_business_type = 1 select * from xfsg_line_pay where deleted = 0 and shop_id = #{shopId} and pay_business_type = 1 order by create_time desc
</select> </select>
<update id="deleteById"> <update id="deleteById">
update xfsg_line_pay set deleted = 1 ,update_time = now(),update_user_id = #{userId} where id = #{id} update xfsg_line_pay set deleted = 1 ,update_time = now(),update_user_id = #{userId} where id = #{id}

4
coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.request; package com.cool.store.request;
import com.cool.store.entity.LinePayDO; import com.cool.store.entity.LinePayDO;
import com.cool.store.enums.ClaimStatusEnum;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@@ -85,8 +86,10 @@ public class LinePaySubmitRequest {
LinePayDO linePayDO = new LinePayDO(); LinePayDO linePayDO = new LinePayDO();
linePayDO.setId(request.getId()); linePayDO.setId(request.getId());
linePayDO.setPartnerId(request.getPartnerId()); linePayDO.setPartnerId(request.getPartnerId());
linePayDO.setShopId(request.getShopId());
linePayDO.setLineId(request.getLineId()); linePayDO.setLineId(request.getLineId());
linePayDO.setPayStatus(PAY_DEPOSIT_50.getCode()); linePayDO.setPayStatus(PAY_DEPOSIT_50.getCode());
linePayDO.setXgjClaimStatus(ClaimStatusEnum.TO_BE_CLAIMED.getCode());
linePayDO.setPayType(request.getPayType()); linePayDO.setPayType(request.getPayType());
linePayDO.setPayUserName(request.getPayUserName()); linePayDO.setPayUserName(request.getPayUserName());
linePayDO.setPayAccount(request.getPayAccount()); linePayDO.setPayAccount(request.getPayAccount());
@@ -101,6 +104,7 @@ public class LinePaySubmitRequest {
} }
linePayDO.setPayPic(request.getPayPic()); linePayDO.setPayPic(request.getPayPic());
linePayDO.setPaySerialNumber(request.getPaySerialNumber()); linePayDO.setPaySerialNumber(request.getPaySerialNumber());
linePayDO.setAmount(request.getAmount());
linePayDO.setPayBusinessType(request.getPayBusinessType()); linePayDO.setPayBusinessType(request.getPayBusinessType());
linePayDO.setRemark(request.getRemark()); linePayDO.setRemark(request.getRemark());
return linePayDO; return linePayDO;