用户律师需求开发

alien-entity/src/main/java/shop/alien/entity/store/dto/LawyerConsultationOrderDto.java

@@ -96,5 +96,9 @@ public class LawyerConsultationOrderDto extends Model<LawyerConsultationOrderDto
 
     @ApiModelProperty(value = "修改人ID")
     private Integer updatedUserId;
+
+    @ApiModelProperty(value = "支付宝订单编号")
+    @TableField("alipay_no")
+    private String alipayNo;
 }
 

alien-entity/src/main/java/shop/alien/mapper/LawyerConsultationOrderMapper.java

@@ -3,11 +3,8 @@ package shop.alien.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import shop.alien.entity.store.LawyerConsultationOrder;
 import shop.alien.entity.store.vo.LawyerConsultationOrderVO;
 
@@ -124,5 +121,41 @@ public interface LawyerConsultationOrderMapper extends BaseMapper<LawyerConsulta
 
 
 
+
+
+
+    @Update("<script>" +
+            "UPDATE `lawyer_consultation_order`" +
+            "<set>" +
+            "<if test='id != null'>`id` = #{id},</if>" +
+            "<if test='orderNumber != null'>`order_number` = #{orderNumber},</if>" +
+            "<if test='clientUserId != null'>`client_user_id` = #{clientUserId},</if>" +
+            "<if test='lawyerUserId != null'>`lawyer_user_id` = #{lawyerUserId},</if>" +
+            "<if test='problemScenarioId != null'>`problem_scenario_id` = #{problemScenarioId},</if>" +
+            "<if test='problemDescription != null'>`problem_description` = #{problemDescription},</if>" +
+            "<if test='orderAmount != null'>`order_amount` = #{orderAmount},</if>" +
+            "<if test='consultationFee != null'>`consultation_fee` = #{consultationFee},</if>" +
+            "<if test='startTime != null'>`start_time`= #{startTime},</if>" +
+            "<if test='endTime != null'>`end_time`= #{endTime},</if>" +
+            "<if test='orderStatus != null'>`order_status` = #{orderStatus},</if>" +
+            "<if test='paymentStatus != null'>`payment_status` = #{paymentStatus},</if>" +
+            "<if test='orderTime != null'>`order_time` = #{orderTime},</if>" +
+            "<if test='paymentTime != null'>`payment_time` = #{paymentTime},</if>" +
+            "<if test='validityPeriod != null'>`validity_period` = #{validityPeriod},</if>" +
+            "<if test='rating != null'>`rating`= #{rating},</if>" +
+            "<if test='comment != null'>`comment`= #{comment},</if>" +
+            "<if test='deleteFlag != null'>`delete_flag` = #{deleteFlag},</if>" +
+            "<if test='createdTime != null'>`created_time` = #{createdTime},</if>" +
+            "<if test='createdUserId != null'>`created_user_id` = #{createdUserId},</if>" +
+            "<if test='updatedTime != null'>`updated_time` = #{updatedTime},</if>" +
+            "<if test='updatedUserId != null'>`updated_user_id` = #{updatedUserId},</if>" +
+            "<if test='alipayNo != null'>`alipay_no` = #{alipayNo},</if>" +
+            "</set>" +
+            "WHERE `order_number` = #{orderNumber}" +
+            "</script>")
+    int updateOrder(LawyerConsultationOrderDto order);
+
+
+
 }
 

alien-store/src/main/java/shop/alien/store/controller/LawyerConsultationOrderController.java

@@ -198,15 +198,15 @@ public class LawyerConsultationOrderController {
     @ApiOperation("是否支付成功更改订单表状态")
     @ApiOperationSupport(order = 10)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "律师订单表id", dataType = "Integer", paramType = "query", required = true),
+            @ApiImplicitParam(name = "orderNumber", value = "订单编号", dataType = "String", paramType = "query", required = true),
             @ApiImplicitParam(name = "paymentStatus", value = "支付状态, 0:未支付, 1:已支付", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "orderStatus", value = "订单状态, 0:待支付, 1:已支付, 2:进行中, 3:已完成, 4:已取消", dataType = "Integer", paramType = "query"),
     })
     @PostMapping("/payStatus")
-    public R<LawyerConsultationOrderDto> payStatus(Integer id, Integer paymentStatus, Integer orderStatus) {
+    public R<LawyerConsultationOrderDto> payStatus(String orderNumber , Integer paymentStatus, Integer orderStatus) {
         log.info("LawyerConsultationOrderController.consultNow?id{},paymentStatus{},orderStatus{}",
-               id, paymentStatus, orderStatus);
-        return consultationOrderService.payStatus(id, paymentStatus, orderStatus);
+                orderNumber, paymentStatus, orderStatus);
+        return consultationOrderService.payStatus(orderNumber, paymentStatus, orderStatus);
     }
 
     @ApiOperation("查询根据用户id查询订单")

alien-store/src/main/java/shop/alien/store/service/LawyerConsultationOrderService.java

@@ -72,7 +72,7 @@ public interface LawyerConsultationOrderService extends IService<LawyerConsultat
 
     R<LawyerConsultationOrderDto> consultNow(Integer clientUserId, Integer lawyerUserId, Integer problemScenarioId , String problemDescription , BigDecimal orderAmount);
 
-    R<LawyerConsultationOrderDto> payStatus(Integer id,Integer paymentStatus,Integer orderStatus);
+    R<LawyerConsultationOrderDto> payStatus(String orderNumber,Integer paymentStatus,Integer orderStatus);
 
 
     /**

alien-store/src/main/java/shop/alien/store/service/impl/LawyerConsultationOrderServiceImpl.java

@@ -254,9 +254,9 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
 
 
     @Override
-    public R<LawyerConsultationOrderDto> payStatus(Integer id, Integer paymentStatus, Integer orderStatus) {
+    public R<LawyerConsultationOrderDto> payStatus(String orderNumber, Integer paymentStatus, Integer orderStatus) {
         log.info("LawyerConsultationOrderServiceImpl.payStatus?id={},paymentStatus={},orderStatus={}",
-                id, paymentStatus, orderStatus);
+                orderNumber, paymentStatus, orderStatus);
 
         //支付宝单笔转账接口
 
@@ -268,7 +268,7 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
 
 
         LawyerConsultationOrderDto order = new LawyerConsultationOrderDto();
-        order.setId(id);
+        order.setOrderNumber(orderNumber);
         order.setPaymentStatus(paymentStatus);
         order.setOrderStatus(orderStatus);
         order.setUpdatedTime(new Date());
@@ -283,7 +283,9 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
                 .withNano(0);
         order.setValidityPeriod(Date.from(validityDateTime.atZone(ZoneId.systemDefault()).toInstant()));
 //        boolean result = this.updateById(order);
-        if (true) {
+        Integer result = consultationOrderMapper.updateOrder(order);
+
+        if (result>0) {
             return R.data(order);
         }
         return R.fail("失败");