Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202208

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
6bdacad648
8 измененных файлов: 40 добавлений и 11 удалений
  1. +11
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java
  3. +4
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  4. +15
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java
  5. +2
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java
  6. +2
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java
  7. +3
    -3
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java
  8. +1
    -1
      mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml

+ 11
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java Просмотреть файл

@@ -134,6 +134,17 @@ public class WxPressBatchController extends BaseController {
wxPressBatchService.deleteItemById(record.getId(), getTenantInfo().getTenantId());
return new ResultData();
}
@ApiOperation("详情接口")
@PostMapping("updateStatus")
public ResultData updateStatus(@RequestBody WxPressBatch record) {
if (null == record.getId() || null == record.getStatus()) {
return new ResultData(Result.ERROR,"参数错误");
}
record.updateTenantInfo(getTenantInfo());
wxPressBatchService.updateStatus(record);
return new ResultData();
}




+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxPressBatchService.java Просмотреть файл

@@ -47,6 +47,8 @@ public interface WxPressBatchService {
void deleteItemById(Long itemId,String tenantId);
void deleteItemByBatchId(Long batchId,String tenantId);
void updateStatus(WxPressBatch pressBatch);
//验证砍价人规则
ResultData checkBargainerPressBatchRule(WxOrder order, Long cUserId);


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -2588,7 +2588,7 @@ public class WxOrderServiceImpl implements WxOrderService {
sharingOrder.setMerchantId(wxMerchantBUser.getMerchantId());
sharingOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode());
sharingOrder.setPayAmount(wxPayOrder.getPayAmount());
WxComposeChildOrderShare share = wxPayOrder.getChildOrderShare(orderId);
WxComposeChildOrderShare share = wxPayOrder.getChildOrderShare(wxOrder.getId());
sharingOrder.setMerchantShareAmount(share.getShareAmount());
sharingOrder.setMallRealRateAmount(share.getRateAmount());
sharingOrder.setRealRateAmount(share.getRealRateAmount());
@@ -2601,13 +2601,14 @@ public class WxOrderServiceImpl implements WxOrderService {
sharingOrder.updateTenantInfo(wxPayOrder);
sharingOrder.setTransactionId(wxPayOrder.getTransactionId());
wxProfitSharingOrderService.createSharingOrder(sharingOrder,wxPayOrder);

} else {
logger.error("微信分账: 未找到payorder or merchant at orderid-" + orderId);
}
} catch (MallinkException e) {
logger.error("微信分账: " + e.getMessage(),e);
} catch (Exception e){
logger.error("微信分账"+e.getMessage(),e);
}
}



+ 15
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java Просмотреть файл

@@ -4,6 +4,7 @@ import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
@@ -69,6 +70,8 @@ public class WxPressBatchServiceImpl implements WxPressBatchService {
@Override
public void saveOrUpdate(WxPressBatch record) {
if (null == record.getId()) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setCreateDate(new Date());
record.setUpdateDate(new Date());
wxPressBatchMapper.insert(record);
@@ -106,8 +109,8 @@ public class WxPressBatchServiceImpl implements WxPressBatchService {
}
}

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public void deleteBatch(Long id, String tenantId) {
wxPressBatchMapper.deleteById(id, tenantId);
deleteItemByBatchId(id, tenantId);
@@ -128,6 +131,17 @@ public class WxPressBatchServiceImpl implements WxPressBatchService {
iteq.setPressBatchId(batchId);
wxPressBatchItemMapper.deleteAllItem(iteq);
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public void updateStatus(WxPressBatch pressBatch) {
wxPressBatchMapper.updateWxPressBatchStatus(pressBatch);
WxPressBatchItem item = new WxPressBatchItem();
item.updateTenantInfo(pressBatch);
item.setPressBatchId(pressBatch.getId());
item.setPressBatchStatus(pressBatch.getStatus());
wxPressBatchItemMapper.updateWxPressBatchStatus(item);
}

@Override
public ResultData checkBargainerPressBatchRule(WxOrder order, Long cUserId) {
@@ -202,5 +216,4 @@ public class WxPressBatchServiceImpl implements WxPressBatchService {
}
return null;
}

}

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java Просмотреть файл

@@ -440,7 +440,8 @@ public class TtPayShareService extends PayShareBaseAdapterService{

List<WxProfitSharingReceiver> list = wxProfitSharingReceiverMapper.findList(psReceiverQ);
if(list == null || list.isEmpty()){
throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未未进件."+payMsg);
return null;
// throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未未进件."+payMsg);
}
if(list.size() > 1){
throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_UNKNOWN.getCode(),"该商户分账帐号异常.");


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v2/WxPayShareService.java Просмотреть файл

@@ -410,7 +410,8 @@ public class WxPayShareService extends PayShareBaseAdapterService{
psReceiverQ.setPlat(EnumAppPlat.WX.getCode());
List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ);
if (null == psReceiverList || psReceiverList.size() == 0) {
throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号.");
return null;
// throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号.");
}else {
for (WxProfitSharingReceiver receiver:psReceiverList) {
if (EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_PERSONAL_WECHATID.getCode().intValue()


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java Просмотреть файл

@@ -149,9 +149,9 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{
}else if (EnumPayMchType.TOTAL.getCode() == mchType) {
receiver = wxProfitSharingReceiverService.findReceiver(tenantEntity, merchantId,EnumAppPlat.WX,EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT);
}
if (null == receiver) {
throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号.");
}
// if (null == receiver) {
// throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该商户未设置分账账号.");
// }
return receiver;
}



+ 1
- 1
mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml Просмотреть файл

@@ -79,7 +79,7 @@
</select>
<update id="updateWxPressBatchStatus" parameterType="com.iformall.domain.po.WxPressBatchItem" >
update wx_press_batch_item set press_batch_status = #{status} where `press_batch_id` = #{pressBatchId} and tenant_id=#{tenantId}
update wx_press_batch_item set press_batch_status = #{pressBatchStatus} where `press_batch_id` = #{pressBatchId} and tenant_id=#{tenantId}
</update>
<delete id= "deleteItem" parameterType="com.iformall.domain.po.WxPressBatchItem" >


Загрузка…
Отмена
Сохранить