yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改订单

This commit is contained in:
曹磊 2024-06-23 23:07:11 +08:00
parent a296247967
commit 00902c0ced
10 changed files with 1440 additions and 848 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java
View File

@ -211,6 +211,14 @@ public class AppArtificerController {
return ordersService.selectOrdersDetails(ordersId); return ordersService.selectOrdersDetails(ordersId);
} }
@Login
@PostMapping("/updateOrders")
@ApiOperation("修改订单")
public Result updateOrders(@RequestBody Orders orders){
return ordersService.updateOrders(orders);
}
@Login @Login
@GetMapping("/selectOrdersList") @GetMapping("/selectOrdersList")
@ApiOperation("查询订单列表") @ApiOperation("查询订单列表")

2070
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

4
src/main/java/com/sqx/modules/coupon/controller/CouponUserController.java
View File

@ -22,8 +22,8 @@ public class CouponUserController extends AbstractController {
@GetMapping("/selectCouponUserList") @GetMapping("/selectCouponUserList")
@ApiOperation("查询用户优惠券") @ApiOperation("查询用户优惠券")
public Result selectCouponUserList(Integer page,Integer limit,Long userId,Integer status,String phone,String couponName){ public Result selectCouponUserList(Integer page,Integer limit,Long id,Long userId,Integer status,String phone,String couponName){
return couponUserService.selectCouponByUserId(page, limit, userId, status, phone,couponName); return couponUserService.selectCouponByUserId(page, limit, id, userId, status, phone,couponName);
} }
@PostMapping("/loseEfficacyCoupon") @PostMapping("/loseEfficacyCoupon")

4
src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java
View File

@ -39,8 +39,8 @@ public class AppCouponUserController extends AbstractController {
@Login @Login
@GetMapping("/selectCouponUserList") @GetMapping("/selectCouponUserList")
@ApiOperation("查询用户优惠券") @ApiOperation("查询用户优惠券")
public Result selectCouponUserList(Integer page,Integer limit,@RequestAttribute Long userId,Integer status,String phone){ public Result selectCouponUserList(Integer page,Integer limit,Long id,@RequestAttribute Long userId,Integer status,String phone){
return couponUserService.selectCouponByUserId(page, limit, userId, status, phone,null); return couponUserService.selectCouponByUserId(page, limit, id ,userId, status, phone,null);
} }
//将所有超过失效时间的优惠券改为失效状态 //将所有超过失效时间的优惠券改为失效状态

2
src/main/java/com/sqx/modules/coupon/dao/CouponUserDao.java
View File

@ -20,7 +20,7 @@ public interface CouponUserDao extends BaseMapper<CouponUser> {
void updateExpiration(@Param("date") String date); void updateExpiration(@Param("date") String date);
IPage<CouponUser> selectCouponByUserId(Page<CouponUser> pages, @Param("userId") Long userId,@Param("status") Integer status, @Param("phone") String phone,@Param("couponName") String couponName); IPage<CouponUser> selectCouponByUserId(Page<CouponUser> pages, @Param("id") Long id,@Param("userId") Long userId,@Param("status") Integer status, @Param("phone") String phone,@Param("couponName") String couponName);
int selectCountCoupon(Long userId); int selectCountCoupon(Long userId);

2
src/main/java/com/sqx/modules/coupon/service/CouponUserService.java
View File

@ -17,7 +17,7 @@ public interface CouponUserService extends IService<CouponUser> {
Result buyCoupon(Long userId, Long couponId); Result buyCoupon(Long userId, Long couponId);
Result selectCouponByUserId(Integer page, Integer limit, Long userId, Integer status, String phone,String couponName); Result selectCouponByUserId(Integer page, Integer limit, Long id, Long userId, Integer status, String phone,String couponName);
Result insertNewUserCoupon(UserEntity userEntity); Result insertNewUserCoupon(UserEntity userEntity);

4
src/main/java/com/sqx/modules/coupon/service/impl/CouponUserServiceImpl.java
View File

@ -89,9 +89,9 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
} }
@Override @Override
public Result selectCouponByUserId(Integer page, Integer limit, Long userId, Integer status, String phone,String couponName) { public Result selectCouponByUserId(Integer page, Integer limit, Long id, Long userId, Integer status, String phone,String couponName) {
Page<CouponUser> pages = new Page<>(page, limit); Page<CouponUser> pages = new Page<>(page, limit);
PageUtils pageUtils = new PageUtils(CouponUserDao.selectCouponByUserId(pages, userId, status, phone,couponName)); PageUtils pageUtils = new PageUtils(CouponUserDao.selectCouponByUserId(pages, id, userId, status, phone,couponName));
return Result.success().put("data", pageUtils); return Result.success().put("data", pageUtils);
} }

96
src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
View File

@ -179,46 +179,51 @@ public class AliPayController {
payDetailsDao.updateState(payDetails.getId(), 1, sdf.format(new Date()), tradeNo); payDetailsDao.updateState(payDetails.getId(), 1, sdf.format(new Date()), tradeNo);
if (payDetails.getType() == 1) { if (payDetails.getType() == 1) {
Orders orders = ordersService.selectOrdersByOrderNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrdersByOrderNo(payDetails.getOrderId());
orders.setStatus(9);//用户已支付技师待接单 if(orders.getIsSupplement() == 2){
orders.setStatus(6);
}else if(orders.getIsSupplement() == 3){
orders.setStatus(2);
}else{
orders.setStatus(9);//用户已支付技师待接单
}
orders.setPayWay(6); orders.setPayWay(6);
orders.setPayTime(sdf.format(new Date())); orders.setPayTime(sdf.format(new Date()));
BigDecimal pingMoney=orders.getPayMoney(); BigDecimal pingMoney=orders.getPayMoney();
// 分佣在订单完成后进行计算 2024-06-20 by caolei UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity user = userService.selectUserById(orders.getUserId()); UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney=BigDecimal.ZERO; BigDecimal oneUserMoney=BigDecimal.ZERO;
// if(oneUser!=null && oneUser.getIsAgency()!=null && oneUser.getIsAgency()==1){ if(oneUser!=null && oneUser.getIsAgency()!=null && oneUser.getIsAgency()==1){
// orders.setOneUserId(oneUser.getUserId()); orders.setOneUserId(oneUser.getUserId());
// orders.setOneUserName(oneUser.getUserName()); orders.setOneUserName(oneUser.getUserName());
// oneUserMoney=pingMoney.multiply(oneUser.getUserRate()); oneUserMoney=pingMoney.multiply(oneUser.getUserRate());
// } }
Artificer artificer = artificerService.getById(orders.getArtificerId()); Artificer artificer = artificerService.getById(orders.getArtificerId());
// UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode());
BigDecimal oneArtificerMoney=BigDecimal.ZERO; BigDecimal oneArtificerMoney=BigDecimal.ZERO;
// if(oneArtificerUser!=null && oneArtificerUser.getIsAgency()!=null && oneArtificerUser.getIsAgency()==1){ if(oneArtificerUser!=null && oneArtificerUser.getIsAgency()!=null && oneArtificerUser.getIsAgency()==1){
// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); orders.setOneArtificerUserId(oneArtificerUser.getUserId());
// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); orders.setOneArtificerUserName(oneArtificerUser.getUserName());
// oneArtificerMoney=pingMoney.multiply(oneArtificerUser.getShopRate()); oneArtificerMoney=pingMoney.multiply(oneArtificerUser.getShopRate());
//
// } }
BigDecimal shopMoney=BigDecimal.ZERO; BigDecimal shopMoney=BigDecimal.ZERO;
// if(artificerUser.getConsortiaId()!=null){ if(artificerUser.getConsortiaId()!=null){
// Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
// if(consortia!=null && consortia.getUserId()!=null){ if(consortia!=null && consortia.getUserId()!=null){
// UserEntity consortiaUser = userService.getById(consortia.getUserId()); UserEntity consortiaUser = userService.getById(consortia.getUserId());
// if(consortiaUser!=null){ if(consortiaUser!=null){
// shopMoney = pingMoney.multiply(consortia.getRate()); shopMoney = pingMoney.multiply(consortia.getRate());
// orders.setConsortiaId(consortia.getConsortiaId()); orders.setConsortiaId(consortia.getConsortiaId());
// orders.setShopUserId(consortiaUser.getUserId()); orders.setShopUserId(consortiaUser.getUserId());
// orders.setShopUserName(consortiaUser.getUserName()); orders.setShopUserName(consortiaUser.getUserName());
//
// } }
// } }
// } }
pingMoney=pingMoney.subtract(orders.getArtificerMoney()); pingMoney=pingMoney.subtract(orders.getArtificerMoney());
pingMoney=pingMoney.subtract(oneUserMoney); pingMoney=pingMoney.subtract(oneUserMoney);
pingMoney=pingMoney.subtract(oneArtificerMoney); pingMoney=pingMoney.subtract(oneArtificerMoney);
@ -297,25 +302,24 @@ public class AliPayController {
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
pingMoney=orders1.getSumMoney(); pingMoney=orders1.getSumMoney();
// 分佣在订单完成后进行计算 2024-06-20 by caolei
oneUserMoney=BigDecimal.ZERO; oneUserMoney=BigDecimal.ZERO;
// if(oneUser!=null && oneUser.getIsAgency()!=null && oneUser.getIsAgency()==1){ if(oneUser!=null && oneUser.getIsAgency()!=null && oneUser.getIsAgency()==1){
// oneUserMoney=pingMoney.multiply(oneUser.getUserRate()); oneUserMoney=pingMoney.multiply(oneUser.getUserRate());
// } }
oneArtificerMoney=BigDecimal.ZERO; oneArtificerMoney=BigDecimal.ZERO;
// if(oneArtificerUser!=null && oneArtificerUser.getIsAgency()!=null && oneArtificerUser.getIsAgency()==1){ if(oneArtificerUser!=null && oneArtificerUser.getIsAgency()!=null && oneArtificerUser.getIsAgency()==1){
// oneArtificerMoney=pingMoney.multiply(oneArtificerUser.getShopRate()); oneArtificerMoney=pingMoney.multiply(oneArtificerUser.getShopRate());
// } }
shopMoney=BigDecimal.ZERO; shopMoney=BigDecimal.ZERO;
// if(artificerUser.getConsortiaId()!=null){ if(artificerUser.getConsortiaId()!=null){
// Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
// if(consortia!=null && consortia.getUserId()!=null){ if(consortia!=null && consortia.getUserId()!=null){
// UserEntity consortiaUser = userService.getById(consortia.getUserId()); UserEntity consortiaUser = userService.getById(consortia.getUserId());
// if(consortiaUser!=null){ if(consortiaUser!=null){
// shopMoney=pingMoney.multiply(consortia.getRate()); shopMoney=pingMoney.multiply(consortia.getRate());
// } }
// } }
// } }
pingMoney=pingMoney.subtract(orders1.getSumArtificerMoney()); pingMoney=pingMoney.subtract(orders1.getSumArtificerMoney());
pingMoney=pingMoney.subtract(oneUserMoney); pingMoney=pingMoney.subtract(oneUserMoney);
pingMoney=pingMoney.subtract(oneArtificerMoney); pingMoney=pingMoney.subtract(oneArtificerMoney);

95
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@ -660,46 +660,48 @@ public class WxServiceImpl implements WxService {
payDetailsDao.updateState(payDetails.getId(), 1, sdf.format(new Date()), ""); payDetailsDao.updateState(payDetails.getId(), 1, sdf.format(new Date()), "");
if(payDetails.getType()==1){ if(payDetails.getType()==1){
Orders orders = ordersService.selectOrdersByOrderNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrdersByOrderNo(payDetails.getOrderId());
orders.setStatus(9);//用户已支付技师待接单 if(orders.getIsSupplement() == 2){
orders.setStatus(6);
}else if(orders.getIsSupplement() == 3){
orders.setStatus(2);
}else{
orders.setStatus(9);//用户已支付技师待接单
}
orders.setPayWay(payDetails.getClassify()); orders.setPayWay(payDetails.getClassify());
orders.setPayTime(sdf.format(new Date())); orders.setPayTime(sdf.format(new Date()));
BigDecimal pingMoney=orders.getPayMoney(); BigDecimal pingMoney=orders.getPayMoney();
// 分佣在订单完成后进行计算 2024-06-20 by caolei UserEntity user = userService.selectUserById(orders.getUserId());
// UserEntity user = userService.selectUserById(orders.getUserId()); UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
// UserEntity oneUser = userService.queryByInvitationCode(user.getInviterCode());
BigDecimal oneUserMoney=BigDecimal.ZERO; BigDecimal oneUserMoney=BigDecimal.ZERO;
// if(oneUser!=null && oneUser.getIsAgency()!=null && oneUser.getIsAgency()==1){ if(oneUser!=null && oneUser.getIsAgency()!=null && oneUser.getIsAgency()==1){
// orders.setOneUserId(oneUser.getUserId()); orders.setOneUserId(oneUser.getUserId());
// orders.setOneUserName(oneUser.getUserName()); orders.setOneUserName(oneUser.getUserName());
// oneUserMoney=pingMoney.multiply(oneUser.getUserRate()); oneUserMoney=pingMoney.multiply(oneUser.getUserRate());
// }
// }
Artificer artificer = artificerService.getById(orders.getArtificerId()); Artificer artificer = artificerService.getById(orders.getArtificerId());
// UserEntity artificerUser = userService.selectUserById(artificer.getUserId()); UserEntity artificerUser = userService.selectUserById(artificer.getUserId());
// UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode()); UserEntity oneArtificerUser = userService.queryByInvitationCode(artificerUser.getInviterCode());
BigDecimal oneArtificerMoney=BigDecimal.ZERO; BigDecimal oneArtificerMoney=BigDecimal.ZERO;
// if(oneArtificerUser!=null && oneArtificerUser.getIsAgency()!=null && oneArtificerUser.getIsAgency()==1){ if(oneArtificerUser!=null && oneArtificerUser.getIsAgency()!=null && oneArtificerUser.getIsAgency()==1){
// orders.setOneArtificerUserId(oneArtificerUser.getUserId()); orders.setOneArtificerUserId(oneArtificerUser.getUserId());
// orders.setOneArtificerUserName(oneArtificerUser.getUserName()); orders.setOneArtificerUserName(oneArtificerUser.getUserName());
// oneArtificerMoney=pingMoney.multiply(oneArtificerUser.getShopRate()); oneArtificerMoney=pingMoney.multiply(oneArtificerUser.getShopRate());
// }
// }
BigDecimal shopMoney=BigDecimal.ZERO; BigDecimal shopMoney=BigDecimal.ZERO;
// if(artificerUser.getConsortiaId()!=null){ if(artificerUser.getConsortiaId()!=null){
// Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
// if(consortia!=null && consortia.getUserId()!=null){ if(consortia!=null && consortia.getUserId()!=null){
// UserEntity consortiaUser = userService.getById(consortia.getUserId()); UserEntity consortiaUser = userService.getById(consortia.getUserId());
// if(consortiaUser!=null){ if(consortiaUser!=null){
// shopMoney = pingMoney.multiply(consortia.getRate()); shopMoney = pingMoney.multiply(consortia.getRate());
// orders.setConsortiaId(consortia.getConsortiaId()); orders.setConsortiaId(consortia.getConsortiaId());
// orders.setShopUserId(consortiaUser.getUserId()); orders.setShopUserId(consortiaUser.getUserId());
// orders.setShopUserName(consortiaUser.getUserName()); orders.setShopUserName(consortiaUser.getUserName());
// }
// } }
// } }
// }
pingMoney=pingMoney.subtract(orders.getArtificerMoney()); pingMoney=pingMoney.subtract(orders.getArtificerMoney());
pingMoney=pingMoney.subtract(oneUserMoney); pingMoney=pingMoney.subtract(oneUserMoney);
pingMoney=pingMoney.subtract(oneArtificerMoney); pingMoney=pingMoney.subtract(oneArtificerMoney);
@ -772,25 +774,24 @@ public class WxServiceImpl implements WxService {
orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney())); orders1.setSumArtificerMoney(orders1.getSumArtificerMoney().add(orders.getArtificerMoney()));
pingMoney=orders1.getSumMoney(); pingMoney=orders1.getSumMoney();
// 分佣在订单完成后进行计算 2024-06-20 by caolei
oneUserMoney=BigDecimal.ZERO; oneUserMoney=BigDecimal.ZERO;
// if(oneUser!=null && oneUser.getIsAgency()!=null && oneUser.getIsAgency()==1){ if(oneUser!=null && oneUser.getIsAgency()!=null && oneUser.getIsAgency()==1){
// oneUserMoney=pingMoney.multiply(oneUser.getUserRate()); oneUserMoney=pingMoney.multiply(oneUser.getUserRate());
// } }
oneArtificerMoney=BigDecimal.ZERO; oneArtificerMoney=BigDecimal.ZERO;
// if(oneArtificerUser!=null && oneArtificerUser.getIsAgency()!=null && oneArtificerUser.getIsAgency()==1){ if(oneArtificerUser!=null && oneArtificerUser.getIsAgency()!=null && oneArtificerUser.getIsAgency()==1){
// oneArtificerMoney=pingMoney.multiply(oneArtificerUser.getShopRate()); oneArtificerMoney=pingMoney.multiply(oneArtificerUser.getShopRate());
// } }
shopMoney=BigDecimal.ZERO; shopMoney=BigDecimal.ZERO;
// if(artificerUser.getConsortiaId()!=null){ if(artificerUser.getConsortiaId()!=null){
// Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId()); Consortia consortia = consortiaService.getById(artificerUser.getConsortiaId());
// if(consortia!=null && consortia.getUserId()!=null){ if(consortia!=null && consortia.getUserId()!=null){
// UserEntity consortiaUser = userService.getById(consortia.getUserId()); UserEntity consortiaUser = userService.getById(consortia.getUserId());
// if(consortiaUser!=null){ if(consortiaUser!=null){
// shopMoney=pingMoney.multiply(consortia.getRate()); shopMoney=pingMoney.multiply(consortia.getRate());
// } }
// } }
// } }
pingMoney=pingMoney.subtract(orders1.getSumArtificerMoney()); pingMoney=pingMoney.subtract(orders1.getSumArtificerMoney());
pingMoney=pingMoney.subtract(oneUserMoney); pingMoney=pingMoney.subtract(oneUserMoney);
pingMoney=pingMoney.subtract(oneArtificerMoney); pingMoney=pingMoney.subtract(oneArtificerMoney);

3
src/main/resources/mapper/coupon/TbCouponUserMapper.xml
View File

@ -31,6 +31,9 @@
left join tb_user tu on tcu.user_id = tu.user_id left join tb_user tu on tcu.user_id = tu.user_id
left join sys_dict d on tcu.classify_id = d.id left join sys_dict d on tcu.classify_id = d.id
where 1 = 1 where 1 = 1
<if test="id!=null">
and tcu.id = #{id}
</if>
<if test="userId!=null"> <if test="userId!=null">
and tcu.user_id = #{userId} and tcu.user_id = #{userId}
</if> </if>