优化 优惠申请

java110-bean/src/main/java/com/java110/dto/applyRoomDiscount/ApplyRoomDiscountDto.java

@@ -31,6 +31,7 @@ public class ApplyRoomDiscountDto extends PageDto implements Serializable {
     private String startTime;
     private String endTime;
     private String state;
+    private String stateName;
     private String communityId;
     private String discountId;
 
@@ -57,7 +58,6 @@ public class ApplyRoomDiscountDto extends PageDto implements Serializable {
     }
 
 
-
     public String getCheckUserId() {
         return checkUserId;
     }
@@ -186,4 +186,12 @@ public class ApplyRoomDiscountDto extends PageDto implements Serializable {
     public void setCreateRemark(String createRemark) {
         this.createRemark = createRemark;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/fee/ApplyRoomDiscountServiceDaoImplMapper.xml

@@ -17,14 +17,15 @@
 
     <!-- 查询房屋折扣申请信息 add by wuxw 2018-07-03 -->
     <select id="getApplyRoomDiscountInfo" parameterType="Map" resultType="Map">
-        select t.apply_type,t.apply_type applyType,t.ard_id,t.ard_id ardId,t.create_user_id,t.create_user_name
+        select t.apply_type,t.apply_type applyType,t.ard_id,t.ard_id ardId,t.create_user_name
         createUserName,t.create_user_tel createUserTel,t.create_remark createRemark,t.check_user_id,t.check_user_id
         checkUserId,t.status_cd,t.status_cd
         statusCd,t.check_remark,t.check_remark checkRemark,t.room_id,t.room_id roomId,t.room_name,t.room_name
         roomName,t.review_user_id,t.review_user_id reviewUserId,t.review_remark,t.review_remark
         reviewRemark,t.start_time,t.start_time startTime,t.end_time,t.end_time
-        endTime,t.state,t.community_id,t.community_id communityId,t.discount_id,t.discount_id discountId
+        endTime,t.state,td.name stateName,t.community_id,t.community_id communityId,t.discount_id,t.discount_id discountId
         from apply_room_discount t
+        left join t_dict td on t.state = td.status_cd and td.table_name='apply_room_discount' and td.table_columns = 'state'
         where 1 =1
         <if test="applyType !=null and applyType != ''">
             and t.apply_type= #{applyType}

service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java

@@ -2,6 +2,7 @@ package com.java110.fee.api;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.applyRoomDiscount.ApplyRoomDiscountDto;
+import com.java110.fee.bmo.applyRoomDiscount.IAuditApplyRoomDiscountBMO;
 import com.java110.fee.bmo.applyRoomDiscount.IDeleteApplyRoomDiscountBMO;
 import com.java110.fee.bmo.applyRoomDiscount.IGetApplyRoomDiscountBMO;
 import com.java110.fee.bmo.applyRoomDiscount.ISaveApplyRoomDiscountBMO;
@@ -31,8 +32,11 @@ public class ApplyRoomDiscountApi {
     @Autowired
     private IGetApplyRoomDiscountBMO getApplyRoomDiscountBMOImpl;
 
+    @Autowired
+    private IAuditApplyRoomDiscountBMO auditApplyRoomDiscountBMOImpl;
+
     /**
-     * 微信保存消息模板
+     * 优惠申请
      *
      * @param reqJson
      * @return
@@ -55,7 +59,7 @@ public class ApplyRoomDiscountApi {
     }
 
     /**
-     * 微信修改消息模板
+     * 验房接口
      *
      * @param reqJson
      * @return
@@ -66,11 +70,11 @@ public class ApplyRoomDiscountApi {
     public ResponseEntity<String> updateApplyRoomDiscount(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-        Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
-        Assert.hasKeyAndValue(reqJson, "roomName", "请求报文中未包含roomName");
-        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
-        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
-        Assert.hasKeyAndValue(reqJson, "applyType", "请求报文中未包含applyType");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含验房状态");
+        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含开始时间");
+        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含结束时间");
+        Assert.hasKeyAndValue(reqJson, "checkRemark", "请求报文中未包含验房说明");
+        Assert.hasKeyAndValue(reqJson, "discountId", "请求报文中未包含折扣");
         Assert.hasKeyAndValue(reqJson, "ardId", "ardId不能为空");
 
 
@@ -78,6 +82,27 @@ public class ApplyRoomDiscountApi {
         return updateApplyRoomDiscountBMOImpl.update(applyRoomDiscountPo);
     }
 
+    /**
+     * 验房接口
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /applyRoomDiscount/auditApplyRoomDiscount
+     * @path /app/applyRoomDiscount/auditApplyRoomDiscount
+     */
+    @RequestMapping(value = "/auditApplyRoomDiscount", method = RequestMethod.POST)
+    public ResponseEntity<String> auditApplyRoomDiscount(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含验房状态");
+        Assert.hasKeyAndValue(reqJson, "reviewRemark", "请求报文中未包含审核说明");
+        Assert.hasKeyAndValue(reqJson, "ardId", "ardId不能为空");
+
+
+        ApplyRoomDiscountPo applyRoomDiscountPo = BeanConvertUtil.covertBean(reqJson, ApplyRoomDiscountPo.class);
+        return auditApplyRoomDiscountBMOImpl.audit(applyRoomDiscountPo);
+    }
+
     /**
      * 微信删除消息模板
      *
@@ -98,7 +123,7 @@ public class ApplyRoomDiscountApi {
     }
 
     /**
-     * 微信删除消息模板
+     * 查询优惠申请
      *
      * @param communityId 小区ID
      * @return

service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/IAuditApplyRoomDiscountBMO.java

@@ -0,0 +1,19 @@
+package com.java110.fee.bmo.applyRoomDiscount;
+
+import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IAuditApplyRoomDiscountBMO {
+
+
+    /**
+     * 修改房屋折扣申请
+     * add by wuxw
+     *
+     * @param applyRoomDiscountPo
+     * @return
+     */
+    ResponseEntity<String> audit(ApplyRoomDiscountPo applyRoomDiscountPo);
+
+
+}

service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/AuditApplyRoomDiscountBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.fee.bmo.applyRoomDiscount.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.fee.bmo.applyRoomDiscount.IAuditApplyRoomDiscountBMO;
+import com.java110.intf.fee.IApplyRoomDiscountInnerServiceSMO;
+import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("auditApplyRoomDiscountBMOImpl")
+public class AuditApplyRoomDiscountBMOImpl implements IAuditApplyRoomDiscountBMO {
+
+    @Autowired
+    private IApplyRoomDiscountInnerServiceSMO applyRoomDiscountInnerServiceSMOImpl;
+
+    /**
+     * @param applyRoomDiscountPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> audit(ApplyRoomDiscountPo applyRoomDiscountPo) {
+
+        int flag = applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}