调整代码

README.md

@@ -67,6 +67,8 @@ eyJhbGciOiJIUzUxMiJ9.eyJhdWQiOiJCRDg0REQ0MkE3MjM0QjA1QjBDNUQxMTYxNjEzMkFDNCIsImp
 
 22、[Calendar中的Calendar.WEEK_OF_YEAR](https://blog.csdn.net/lxl_family/article/details/80004951)
 
+23、 [Mybatis时间范围查询，亲测有效](https://www.shuzhiduo.com/A/amd0wwkj5g/)
+
 ###知识点收集：
 首先使用Calendar calendar = Calendar.getInstance();//获取Calendar
 

src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java

@@ -108,7 +108,7 @@ public class AdminAccountCloseController extends BaseController {
     @PostMapping("/ratioList")
     public JSONObject ratioList(@RequestBody String rejson){
         JSONObject request =JSONObject.parseObject(rejson);
-        String ruleName = request.getString("'rule_name'");
+        String ruleName = request.getString("rule_name");
         String userId=request.getString("user_id");
         String status = request.getString("status");
         String createtime = request.getString("createtime");

src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java

@@ -214,14 +214,27 @@ public class AdminGoodsController extends BaseController {
 
     /**
      * 手动下架委托数
-     * @param goodsIsli
+     * @param request
      * @return
      */
     @RequestMapping("/whetherOff")
-    public JSONObject whetherOff(String goodsIsli){
+    public JSONObject whetherOff(HttpServletRequest request){
+        String goodsIsli = request.getParameter("goods_isli");
         Map mp =goodsService.whetherOff(goodsIsli);
         jsonObject.put("code",mp.get("code"));
         jsonObject.put("msg",mp.get("msg"));
         return jsonObject;
     }
+
+
+    @RequestMapping("/offGoods")
+    public JSONObject offGoods(@RequestBody String jstr){
+        JSONObject request = JSONObject.parseObject(jstr);
+        String goodsIsli = request.getString("goods_isli");
+        String reason = request.getString("reason");
+
+        jsonObject.put("code",200);
+        jsonObject.put("msg","申请下架成功");
+        return jsonObject;
+    }
 }

src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java

@@ -29,6 +29,13 @@ public interface GoodsMapper {
      */
     Goods getGoodsByIsli(String goodsIsli);
 
+    /**
+     * 查询所有的属性
+     * @param goodsIsli
+     * @return
+     */
+    Goods getGoodsFuelByIsLi(String goodsIsli);
+
     /**
      * 根据条件统计数量
      * @param map

src/main/java/cn/chjyj/szwh/service/GoodsService.java

@@ -56,4 +56,12 @@ public interface GoodsService {
      * @return
      */
     Map<String,Object> whetherOff(String goodsIsli);
+
+    /**
+     * 商品下架
+     * @param goodsIsli
+     * @param reason
+     * @return
+     */
+    void offGoods(String goodsIsli, String reason);
 }

src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java

@@ -5,7 +5,10 @@ import cn.chjyj.szwh.bean.*;
 import cn.chjyj.szwh.mapper.*;
 import cn.chjyj.szwh.service.AccountCloseService;
 import cn.chjyj.szwh.vo.SettleVo;
+import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +21,7 @@ import java.util.Map;
 
 @Service
 public class AccountCloseServiceImpl implements AccountCloseService {
+    private static Log log = LogFactory.getLog(AccountCloseServiceImpl.class);
     @Autowired
     private PaySettingMapper paySettingMapper;
     @Autowired
@@ -120,16 +124,22 @@ public class AccountCloseServiceImpl implements AccountCloseService {
             query.put("status",status);
         }
         if(StringUtils.isNotBlank(createtime) && !"[]".equals(createtime)){
-            query.put("createtime",createtime);
+            JSONArray jsonArray = JSONArray.parseArray(createtime);
+
+            String btstr ="createtime BETWEEN date_format('"+jsonArray.get(0)+ "T00:00:00' ,'%Y-%m-%d %H:%i:%s') " +
+                    "AND date_format('"+jsonArray.get(1)+"T23:59:59','%Y-%m-%d %H:%i:%s')";
+            query.put("btstr",btstr);
         }
 
-        int total = accountRatioSettingMapper.countAcRs();
+        int total = accountRatioSettingMapper.countAccountRatioSetting(query);
         Map retmap=new HashMap();
         int startrs=ipage>1?(ipage-1)*ilimit:0;
+        int end = ipage*ilimit>total?total:ipage*ilimit;
+
         retmap.put("start",startrs+1);
         retmap.put("cur_page",ipage);
         retmap.put("limit",ilimit);
-        retmap.put("end",ipage*ilimit);
+        retmap.put("end",end);
         retmap.put("per_page",ilimit);
         retmap.put("total",total);
 

src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java

@@ -260,14 +260,18 @@ public class GoodsServiceImpl implements GoodsService {
         Map retmap = new HashMap();
         String msg="没有该条委托数据";
         int code=400;
-        Goods goods = goodsMapper.getGoodsByIsli(goodsIsli);
-        // 非在售状态
-        if(goods.getGoodsStatus()!=1 && goods.getGoodsStatus()!=5){
-            msg="暂时只支持对已发布/暂停中文化数据进行撤销！";
-        }
-        //
-        if(goods.getApplyOut()==1){
-            msg="请勿重复提交撤销委托申请！";
+        Goods goods = goodsMapper.getGoodsFuelByIsLi(goodsIsli);
+        // 非空，继续判断
+        if(goods!=null) {
+            // 非在售状态
+            if (goods.getGoodsStatus() != 1 && goods.getGoodsStatus() != 5) {
+                msg = "暂时只支持对已发布/暂停中文化数据进行撤销！";
+            }else if (goods.getApplyOut() == 1) {
+                msg = "请勿重复提交撤销委托申请！";
+            }else{
+                code=200;
+                msg="可以下架";
+            }
         }
 
         retmap.put("msg",msg);
@@ -275,4 +279,37 @@ public class GoodsServiceImpl implements GoodsService {
 
         return retmap;
     }
+
+    @Override
+    public void offGoods(String goodsIsli, String reason) {
+        //todo 暂时跳过 goods 验证
+//        $url = env("app.entrust_url") . "/consign/exchange/v1/exchangeRevokeEntrust";
+//        $sign = parent::createSign("entrust");
+//        $headers = array(
+//                CURLOPT_HTTPHEADER => array(
+//                "entrust_token:{$sign}"
+//        )
+//        );
+//        $post = [
+//        "revokeReason" => $reason,
+//                "isliCode" => $goods->islicode,
+//                "status" => 3,
+//        ];
+//        //todo 请求交易所撤销委托接口 接口1.4
+//        $res = Http::get($url, $post, $headers);
+//        if($res['code'] != 200){
+//            throw new \think\Exception($res['msg'], 400);
+//        }
+//        $res = json_decode($res['data'], true);
+//        if($res['resultCode'] != "00000000"){
+//            throw new \think\Exception($res['resultMsg'], 400);
+//        }
+//        Goods::where('id', $goods->id)->update(['apply_out' => 1]);
+//        $operation_log = [
+//        "type" => "goods",
+//                "log_id" => $goods->id,
+//                "message" => date('Y-m-d H:i:s') . " 由{$this->account_name}申请撤销委托，撤销原因：{$reason}"
+//        ];
+//        (new OperationLog())->insert($operation_log);
+    }
 }

src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java

@@ -41,4 +41,18 @@ public class SzwhApiUtils {
         log.info("request result:"+json);
         return json;
     }
+
+    public static JSONObject offGoods(){
+        String entHost= ProperUtils.getSzwhProp("ENTRUST_URL");//委托系统主机
+        String url=entHost+"/consign/exchange/v1/exchangeRevokeEntrust";
+        String sign=SignUtils.createSign("entrust");
+        // 请求头
+        Map hmap = new HashMap();
+        hmap.put("entrust_token",sign);
+
+        // 发送post请求
+
+        JSONObject json = RequestUtils.GetData(url,hmap);
+        return json;
+    }
 }

src/main/resources/mapper/szwh/AccountRatioSettingMapper.xml

@@ -18,14 +18,18 @@
     </select>
 
     <!-- 主键查询用户信息 -->
-    <select id="getAccRatioSettingById" parameterType="java.lang.Integer" resultType="cn.chjyj.szwh.bean.AccountRatioSetting">
-        select <include refid="column"/>
-        from <include refid="tbName"/>
+    <select id="getAccRatioSettingById" parameterType="java.lang.Integer"
+            resultType="cn.chjyj.szwh.bean.AccountRatioSetting">
+        select
+        <include refid="column"/>
+        from
+        <include refid="tbName"/>
         where id=#{id};
     </select>
 
     <!-- 查询列表 -->
-    <select id="getRatioSettingList" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.AccountRatioSetting">
+    <select id="getRatioSettingList" parameterType="java.lang.String"
+            resultType="cn.chjyj.szwh.bean.AccountRatioSetting">
         select
         id,user_id as userId,rule_name as ruleName,createtime,status,createtime,is_deleted
         from
@@ -33,20 +37,48 @@
         <where>
             <if test="map!=null">
                 <foreach collection="map" item="v" index="k" separator="and">
-                    <if test="v != null and v != ''">
+                    <if test="v != null and v != '' and k!='rule_name' and k!='btstr'">
                         ${k} = #{v}
                     </if>
+                    <if test="k=='rule_name'">
+                        rule_name like concat('%',#{v},'%')
+                    </if>
+                    <if test="k=='btstr'">
+                        ${v}
+                    </if>
                 </foreach>
                 and
             </if>
-            id>#{startrs}
+            <if test="startrs!=null">
+                 id>#{startrs}
+            </if>
         </where>
-         limit #{limit}
+        limit #{limit}
     </select>
 
+    <!--    按照条件统计数量-->
+    <select id="countAccountRatioSetting" resultType="java.lang.Integer">
+        select count(*)
+        from
+        <include refid="tbName"/>
+        <where>
+            <foreach collection="map" item="v" index="k" separator="and">
+                <if test="v != null and v != '' and k!='rule_name' and k!='btstr'">
+                    ${k} = #{v}
+                </if>
+                <if test="k=='rule_name'">
+                    rule_name like concat('%',#{v},'%')
+                </if>
+                <if test="k=='btstr'">
+                    ${v}
+                </if>
+            </foreach>
+        </where>
+    </select>
     <!-- 统计数量 -->
     <select id="countAcRs" resultType="java.lang.Integer">
-        select count(*) from <include refid="tbName"/>
+        select count(*) from
+        <include refid="tbName"/>
     </select>
 
     <!--新增用户 id 自增加-->
@@ -62,7 +94,8 @@
 
     <!-- 变更状态 -->
     <update id="ratioStatus" parameterType="java.lang.Integer">
-        update <include refid="tbName"/>
+        update
+        <include refid="tbName"/>
         set status=#{status}
         where id=#{id};
     </update>

src/main/resources/mapper/szwh/GoodsMapper.xml

@@ -151,6 +151,12 @@
         where is_deleted=0 AND goods_islicode=#{goodsIsli} limit 1;
     </select>
 
+    <select id="getGoodsFuelByIsLi" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.Goods">
+        select <include refid="column"/>
+        from <include refid="tbName"/>
+        where is_deleted=0 AND goods_islicode=#{goodsIsli} limit 1;
+    </select>
+
     <!--查询用户-->
     <select id="getSingleUserByOpenid" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.Goods">
         select

src/test/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapperTest.java

@@ -32,6 +32,8 @@ public class AccountRatioSettingMapperTest {
         int starrs=0;
         int limit=10;
         imap.put("rule_name","测试");
+        imap.put("btstr", "createtime BETWEEN date_format('2022-05-16','%Y-%m-%d %H:%i:%s') " +
+                "AND date_format('2022-05-18','%Y-%m-%d %H:%i:%s')");
         List<AccountRatioSetting> slist = accountRatioSettingMapper.getRatioSettingList(imap,starrs,limit);
         for(AccountRatioSetting acs:slist){
             System.out.println(acs.getRuleName());
@@ -39,6 +41,6 @@ public class AccountRatioSettingMapperTest {
 
         //统计符合条件的数量
         int ret = accountRatioSettingMapper.countAccountRatioSetting(imap);
-        System.out.println(ret);
+        System.out.println("共有： "+ret);
     }
 }