提交 验票子账号演出关联关系 vo redis

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayOrderParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class PayOrderParam {
+    @ApiModelProperty(value = "演出id")
+    @NotNull(message = "必传")
+    private String performanceId;
+    @ApiModelProperty(value = "场次id")
+    @NotNull(message = "必传")
+    private String timeId;
+    @ApiModelProperty(value = "票种id")
+    @NotNull(message = "必传")
+    private String ticketId;
+    @ApiModelProperty(value = "数量")
+    @NotNull(message = "必传")
+    private Integer number;
+
+    @ApiModelProperty(value = "是否学生票")
+    @NotNull(message = "必传")
+    private Integer isStudent;
+    @ApiModelProperty(value = "是否电子票")
+    @NotNull(message = "必传")
+    private Integer isElectronic;
+    @ApiModelProperty(value = "是否快递票")
+    @NotNull(message = "必传")
+    private Integer isExpress;
+
+    @ApiModelProperty(value = "收货地址id")
+    private String addressId;
+    @ApiModelProperty(value = "入场人id数组")
+    private List<String> enterIdList;
+    @ApiModelProperty(value = "代理id")
+    @NotNull(message = "必传")
+    private String agentId;
+
+    @ApiModelProperty(value = "支付类型")
+    @NotNull(message = "必传")
+    private String payType;
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

 package com.liquidnet.service.kylin.service;
 
+import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
 
     // 下单前判断接口(判断是否可锁定库存)
+    boolean checkCanOrder(PayOrderParam payOrderParam);
 
     // 下单接口(无订单->待支付->可支付)
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinCheckUserPartnerController.java

@@ -54,7 +54,7 @@ public class KylinCheckUserPartnerController {
     public ResponseDto<String> change(@RequestParam("merchantId") String merchantId,
                                       @RequestParam("checkUserId") String checkUserId,
                                       @RequestParam("name") String name,
-                                      @RequestParam("pwd") String pwd,
+                                      @RequestParam(value = "pwd",required = false) String pwd,
                                       @RequestParam("mobile") String mobile) {
         return checkUserPartnerService.change(merchantId, checkUserId, name, pwd, mobile);
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinCheckUserPartnerServiceImpl.java

@@ -114,7 +114,9 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
         try {
             KylinCheckUser checkUser = new KylinCheckUser();
             checkUser.setName(name);
+            if(!pwd.isEmpty()) {
                 checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
+            }
             checkUser.setMobile(mobile);
             checkUser.setUpdatedAt(LocalDateTime.now());
             checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId).eq("merchant_id", merchantId));