线上订单完善

hcp-core/src/main/java/com/yingyangfly/core/domain/WxApplicationBlank.java

@@ -84,6 +84,12 @@ public class WxApplicationBlank {
      */
     private String orgName;
 
+    /**
+     * 患者手机号
+     */
+    @JsonSerialize(using = Sm4JacksonSerialize.class)
+    private String phone;
+
 
     @TableField(exist = false)
     private java.lang.Integer page;

hcp-core/src/main/java/com/yingyangfly/core/service/WxApplicationBlankService.java

@@ -23,7 +23,7 @@ public interface WxApplicationBlankService extends IService<WxApplicationBlank>
     Integer payUpdateApplicationBlank(WxApplicationBlank wxApplicationBlank,String orderNumber);
 
 
-    void updatePayStatusFulfill(Long id);
+    void updatePayStatusFulfill(WxApplicationBlank wxApplicationBlank);
 
     /**
      * 判断线上是否有支付成功患者

hcp-core/src/main/java/com/yingyangfly/core/service/impl/WxApplicationBlankServiceImpl.java

@@ -18,6 +18,7 @@ import com.yingyangfly.core.util.AmountUtils;
 import com.yingyangfly.core.util.Sm4Util;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jacoco.agent.rt.internal_035b120.core.internal.flow.IFrame;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -65,8 +66,13 @@ public class WxApplicationBlankServiceImpl extends ServiceImpl<WxApplicationBlan
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updatePayStatusFulfill(Long id) {
-        WxApplicationBlank wxApplicationBlank1 = baseMapper.selectById(id);
+    public void updatePayStatusFulfill(WxApplicationBlank wxApplicationBlankParmes) {
+        WxApplicationBlank wxApplicationBlank1 = baseMapper.selectById(wxApplicationBlankParmes.getId());
+        if (ObjectUtils.isNotEmpty(wxApplicationBlankParmes.getPhone())){
+            wxApplicationBlankParmes.setPhone(Sm4Util.encrypt(wxApplicationBlankParmes.getPhone()));
+        }else {
+            wxApplicationBlankParmes.setPhone(wxApplicationBlank1.getMobile());
+        }
         if (!wxApplicationBlank1.getPayStatus().equals("2")) {
             throw new RuntimeException("患者未支付或申请单已完成");
         }
@@ -74,23 +80,30 @@ public class WxApplicationBlankServiceImpl extends ServiceImpl<WxApplicationBlan
         lambdaQueryWrapper.eq(AppUser::getMobile,wxApplicationBlank1.getMobile());
         AppUser appUser = appUserMapper.selectOne(lambdaQueryWrapper);
         if (ObjectUtils.isEmpty(appUser)) {
-            throw new RuntimeException("请先新增患者信息");
+            LambdaQueryWrapper<AppUser> appUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            appUserLambdaQueryWrapper.eq(AppUser::getMobile,wxApplicationBlankParmes.getPhone());
+            appUser = appUserMapper.selectOne(appUserLambdaQueryWrapper);
+            if (ObjectUtils.isEmpty(appUser)){
+                throw new RuntimeException("请先新增患者信息");
+            }
         }
 
         // 修改申请单为完成
         WxApplicationBlank wxApplicationBlank = new WxApplicationBlank();
-        wxApplicationBlank.setId(id);
+        wxApplicationBlank.setId(wxApplicationBlankParmes.getId());
         wxApplicationBlank.setPayStatus("0");
+        wxApplicationBlank.setPhone(wxApplicationBlankParmes.getPhone());
         baseMapper.updateById(wxApplicationBlank);
 
         //  修改患者所属机构
         SysUser sysUser = sysUserService.getById(wxApplicationBlank1.getDoctorId());  // 医生信息
         AppUser UpdateAppUser = new AppUser();
+        UpdateAppUser.setId(appUser.getId());
         UpdateAppUser.setOrgCode(sysUser.getOrgCode());
         UpdateAppUser.setOrgName(sysUser.getOrgName());
         UpdateAppUser.setDoctorId(wxApplicationBlank1.getDoctorId());
         UpdateAppUser.setDoctorName(sysUser.getUserName());
-        appUserMapper.update(UpdateAppUser,lambdaQueryWrapper);
+        appUserMapper.updateById(UpdateAppUser);
 
         // 创建订单
         PayOrder payOrderA = new PayOrder();
@@ -98,7 +111,7 @@ public class WxApplicationBlankServiceImpl extends ServiceImpl<WxApplicationBlan
         payOrderA.setRelationId(wxApplicationBlank1.getPackageId());
         payOrderA.setPayOrderId(wxApplicationBlank1.getPayOrderId());
         payOrderA.setDescription(wxApplicationBlank1.getDescription());
-        payOrderA.setPayer(wxApplicationBlank1.getPayer());
+        payOrderA.setPayer(appUser.getName());
         payOrderA.setPayMoney(wxApplicationBlank1.getEquipmentPledge());
         payOrderA.setPayMethod("1");
         payOrderA.setSendPayTime(wxApplicationBlank1.getSendPayTime());
@@ -121,7 +134,7 @@ public class WxApplicationBlankServiceImpl extends ServiceImpl<WxApplicationBlan
         String orderNo = "LT_SUB_" + IdUtils.getNextId();
         payOrderB.setPayOrderId(orderNo);
         payOrderB.setDescription(wxApplicationBlank1.getDescription());
-        payOrderB.setPayer(wxApplicationBlank1.getPayer());
+        payOrderB.setPayer(appUser.getName());
         long payMoney = wxApplicationBlank1.getPayMoney() - wxApplicationBlank1.getEquipmentPledge();
         payOrderB.setPayMoney(payMoney);
         payOrderB.setPayMethod("1");

hcp-platform/src/main/java/com/yingyangfly/platform/controller/WxApplicationBlankController.java

@@ -42,10 +42,10 @@ public class WxApplicationBlankController {
     }
 
 
-    @GetMapping(value = "update/payStatusFulfill/{id}")
-    public ResultResponse updatePayStatusFulfill(@PathVariable("id") Long id)
+    @PostMapping(value = "update/payStatusFulfill")
+    public ResultResponse updatePayStatusFulfill(@RequestBody WxApplicationBlank wxApplicationBlank)
     {
-        wxApplicationBlankService.updatePayStatusFulfill(id);
+        wxApplicationBlankService.updatePayStatusFulfill(wxApplicationBlank);
         return ResultResponse.success();
     }