Bladeren bron

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

release_toaliyun_real
xiaohanzi 5 jaren geleden
bovenliggende
commit
928c24147a
9 gewijzigde bestanden met toevoegingen van 88 en 13 verwijderingen
  1. +8
    -8
      mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  3. +52
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
  6. +2
    -2
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
  7. +18
    -0
      mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  8. +1
    -1
      mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java
  9. +1
    -1
      mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java

+ 8
- 8
mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java Bestand weergeven

@@ -49,24 +49,24 @@ public class AppTest {
*/
IdWorker idWorker = IdWorker.get();

// paramMap.put("sourceType", EnumUserType.THIRD_CIRCLE.getCode().toString());
paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString());

paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id
paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店
paramMap.put("shopName","百丽");//门店名称
paramMap.put("userNumber","441388943427399680");//***会员Id
// paramMap.put("shopName","百丽");//门店名称
paramMap.put("userNumber","564603843541262336");//***会员Id
// paramMap.put("userPhone","18872592633");//会员手机号
paramMap.put("timeEnd","2021-06-15 16:13:11");//***付款时间(yyyy-MM-dd HH:mm:ss)
paramMap.put("amount","9100");//***付款金额(分)
paramMap.put("timeEnd","2021-06-16 15:28:00");//***付款时间(yyyy-MM-dd HH:mm:ss)
paramMap.put("amount","1000");//***付款金额(分)
// paramMap.put("summary","");//付款摘要

/**
* 交易退款信息 参数
*/
// IdWorker idWorker = IdWorker.get();
//// paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString());
// paramMap.put("transactionId","564279392066437120");//***订单Id
// paramMap.put("refundTime","2021-06-14 00:58:00");//***退款时间(yyyy-MM-dd HH:mm:ss)
// paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString());
// paramMap.put("transactionId","565041847967240192");//***订单Id
// paramMap.put("refundTime","2021-06-16 15:21:21");//***退款时间(yyyy-MM-dd HH:mm:ss)
//// paramMap.put("refundAmount","1000");//退款金额(分)
// paramMap.put("refundSummary","我要退款1");//付款摘要
// paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Bestand weergeven

@@ -172,4 +172,8 @@ public interface WxMerchantService {


ResultData addttMerchant(WxMerchant wxMerchant, Long userId);

ResultData ttdisable(Long id);

ResultData ttstartusing(Long id);
}

+ 52
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Bestand weergeven

@@ -12,6 +12,7 @@ import com.iformall.domain.dto.WxMerchantDto;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.tt.TtCoupon;
import com.iformall.domain.po.tt.TtUserFollow;
import com.iformall.domain.vo.*;
import com.iformall.enums.*;
@@ -105,6 +106,9 @@ public class WxMerchantServiceImpl implements WxMerchantService {
@Autowired
WxMallService wxMallService;

@Autowired
TtCouponMapper ttCouponMapper;

@Autowired
TtUserFollowMapper ttUserFollowMapper;

@@ -1088,4 +1092,52 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}
}

@Override
@Transactional(rollbackFor = {Exception.class})
public ResultData ttdisable(Long id) {
WxMerchant wxMerchant = wxMerchantMapper.selectById(id);
if (wxMerchant == null || wxMerchant.getStatus().equals(EnumYesOrNo.NO.getCode())) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"作者信息未找到或者已停用");
}
//停用作者
WxMerchant disableMerchant = new WxMerchant();
disableMerchant.setId(id);
disableMerchant.setStatus(EnumYesOrNo.NO.getCode());
disableMerchant.setMark(EnumYesOrNo.NO.getCode());
disableMerchant.setUpdateDate(new Date());
wxMerchantMapper.updateById(disableMerchant);
//下架作者所有作品
TtCoupon couponq = new TtCoupon();
couponq.setMerchantId(id);
couponq.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode());
TtCoupon coupon = new TtCoupon();
coupon.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_AFTER_SHELF.getCode());
coupon.setMark(EnumYesOrNo.NO.getCode());
coupon.setUpdateDate(new Date());
ttCouponMapper.update(coupon,new QueryWrapper<>(couponq));
//驳回作者下所有审核中的作品
couponq.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_EXAMINE.getCode());
coupon.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_REJECT.getCode());
coupon.setRemark("作者停用");
ttCouponMapper.update(coupon,new QueryWrapper<>(couponq));
//关闭所有待支付订单(暂未处理)

return new ResultData();
}

@Override
public ResultData ttstartusing(Long id) {
WxMerchant wxMerchant = wxMerchantMapper.selectById(id);
if (wxMerchant == null || wxMerchant.getStatus().equals(EnumYesOrNo.NO.getCode())) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"作者信息未找到或者已启用");
}
WxMerchant disableMerchant = new WxMerchant();
disableMerchant.setId(id);
disableMerchant.setStatus(EnumYesOrNo.YES.getCode());
disableMerchant.setUpdateDate(new Date());
wxMerchantMapper.updateById(disableMerchant);

return new ResultData();
}

}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java Bestand weergeven

@@ -190,6 +190,7 @@ public class TtCouponServiceImpl implements TtCouponService {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不允许下架或者已下架");
}
byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_AFTER_SHELF.getCode());
byId.setMark(EnumYesOrNo.NO.getCode());
byId.setUpdateDate(new Date());
ttCouponMapper.updateById(byId);
return new ResultData();


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java Bestand weergeven

@@ -411,7 +411,7 @@ public class TtOrderServiceImpl implements TtOrderService {
WxMerchant merchant = new WxMerchant();
merchant.setId(order.getMerchantId());
merchant.setEntryAmount(order.getPayment());
merchant.setCashOutNumber(order.getPayment());
// merchant.setCashOutNumber(order.getPayment());
int i = wxMerchantMapper.recordedAmount(merchant);
if(i == 1){
ttOrderMapper.updateIsRecorded(order.getId(),EnumYesOrNo.YES.getCode());


+ 2
- 2
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Bestand weergeven

@@ -702,8 +702,8 @@

<update id="recordedAmount" parameterType="com.iformall.domain.po.WxMerchant">
update wx_merchant set
entry_amount = ifnull(entry_amount,0)+#{entryAmount},
cash_out_number = ifnull(cash_out_number,0)+#{cashOutNumber}
entry_amount = ifnull(entry_amount,0)+#{entryAmount}
/*,cash_out_number = ifnull(cash_out_number,0)+#{cashOutNumber}*/
where id = #{id}
</update>



+ 18
- 0
mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Bestand weergeven

@@ -382,6 +382,24 @@ public class WxMerchantController extends BaseController {
return resultData;
}

@ApiOperation("停用作者")
@GetMapping("ttdisable")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "商户-停用")
public ResultData ttdisable(Long id) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::ttdisable");
return wxMerchantService.ttdisable(id);
}

@ApiOperation("启用作者")
@GetMapping("ttstartusing")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "商户-停用")
public ResultData ttstartusing(Long id) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::ttstartusing");
return wxMerchantService.ttstartusing(id);
}

@ApiOperation("根据id查询接口")
@GetMapping("/findttById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)


+ 1
- 1
mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java Bestand weergeven

@@ -136,7 +136,7 @@ public class TtCouponController extends BaseController {
return new ResultData(ErrorCode.SYS_SERVER_ERROR,"数据异常,未找到课程视频");
}
}else{
return new ResultData(ErrorCode.SYS_SERVER_ERROR,"数据异常");
return new ResultData(ErrorCode.SYS_SERVER_ERROR,"数据异常{type}");
}
}
}else{


+ 1
- 1
mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java Bestand weergeven

@@ -49,7 +49,7 @@ public class TtOrderExpiringSchedule {
Map<String, WxPayAccount> wxPayAccountMap = new HashMap<>();
WxAppinfo appQ = new WxAppinfo();
appQ.setType(EnumAppType.C.getCode());
appQ.setPlat(EnumPayWay.PAY_WAY_TT.getCode());
appQ.setPlat(EnumPayWay.PAY_WAY_TT.getPlat().getCode());
List<WxAppinfo> wxAppinfoList = wxAppinfoService.getList(appQ);
for (WxAppinfo wxAppinfo:wxAppinfoList) {
wxAppinfoMap.put(wxAppinfo.getFinalTenantId(),wxAppinfo);//一个集团一个小程序


Laden…
Annuleren
Opslaan